qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: usb: ehci: mxs: fix swapped argument in ehci_writel() 

ehci_writel() swaps the arguments for address and value. One call
in ehci-mxs ignores that.

This fixes the warning:

drivers/usb/host/ehci-mxs.c: In function ?ehci_hcd_stop?:
drivers/usb/host/ehci-mxs.c:159:19: error: initialization makes integer from pointer without a cast [-Werror=int-conversion]
  ehci_writel(tmp, &hcor->or_usbcmd);
                   ^
arch/arm/include/asm/io.h:117:34: note: in definition of macro ?writel?
 #define writel(v,c) ({ u32 __v = v; __iowmb(); __arch_putl(__v,c); __v; })
                                  ^
drivers/usb/host/ehci-mxs.c:159:2: note: in expansion of macro ?ehci_writel?
  ^~~~~~~~~~~

Change-Id: I9b7bccbd906f21bb51e91bae97c3f9f08e199493
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit 6f7c92db4c7d1e45503fb10e60caa1ec2bb18d10)
This commit is contained in:
Daniel Schwierzeck 2018-01-25 20:43:58 +01:00 committed by Frank Wang
parent 0b717d3ee0
commit 7dfe2a4c07
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/host/ehci-mxs.c
View File

@ -156,7 +156,7 @@ int ehci_hcd_stop(int index)
tmp = ehci_readl(&hcor->or_usbcmd); tmp = ehci_readl(&hcor->or_usbcmd);
tmp &= ~CMD_RUN; tmp &= ~CMD_RUN;
ehci_writel(tmp, &hcor->or_usbcmd); ehci_writel(&hcor->or_usbcmd, tmp);
/* Disable the PHY */ /* Disable the PHY */
tmp = USBPHY_PWD_RXPWDRX | USBPHY_PWD_RXPWDDIFF | tmp = USBPHY_PWD_RXPWDRX | USBPHY_PWD_RXPWDDIFF |