summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorBenoît Thébaudeau <benoit.thebaudeau@advansee.com>2012-11-13 09:56:30 +0000
committerStefano Babic <sbabic@denx.de>2012-11-16 09:16:44 +0100
commit7d42432d38af11f9d05398c3b6d29a54ab3322c8 (patch)
tree883fab9a4698b77043ba282f3b38dc90948843a7 /drivers/usb
parentbdc5202068ec778ae2eecb818559ce7c61057109 (diff)
downloadtalos-obmc-uboot-7d42432d38af11f9d05398c3b6d29a54ab3322c8.tar.gz
talos-obmc-uboot-7d42432d38af11f9d05398c3b6d29a54ab3322c8.zip
ehci-mx5: Fix OC_DIS usage
MXC_OTG_PHYCTRL_OC_DIS_BIT disables the oc pin if set, like MXC_H1_OC_DIS_BIT, not the opposite. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Cc: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ehci-mx5.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index 46973b01bd..72cde1a92a 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -151,11 +151,11 @@ int mxc_set_usbcontrol(int port, unsigned int flags)
v = __raw_readl(usbother_base +
MXC_USB_PHY_CTR_FUNC_OFFSET);
if (flags & MXC_EHCI_POWER_PINS_ENABLED)
- /* OC/USBPWR is not used */
- v |= MXC_OTG_PHYCTRL_OC_DIS_BIT;
- else
/* OC/USBPWR is used */
v &= ~MXC_OTG_PHYCTRL_OC_DIS_BIT;
+ else
+ /* OC/USBPWR is not used */
+ v |= MXC_OTG_PHYCTRL_OC_DIS_BIT;
__raw_writel(v, usbother_base +
MXC_USB_PHY_CTR_FUNC_OFFSET);
OpenPOWER on IntegriCloud