From: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Date: Tue, 13 Nov 2012 09:56:44 +0000 (+0000)
Subject: ehci-mx5: Fix OPM usage
X-Git-Tag: v2013.01-rc3~9^2~3^2~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=394c00dcfc9751030cbd9eb87ab2492d234f9ace;p=oweals%2Fu-boot.git

ehci-mx5: Fix OPM usage

MXC_OTG_UCTRL_OPM_BIT disables (masks) the power/oc pins if set, like
MXC_H1_UCTRL_H1PM_BIT and MXC_H2_UCTRL_H2PM_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>
---

diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index 72cde1a92a..8c1b70a87a 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -161,9 +161,9 @@ int mxc_set_usbcontrol(int port, unsigned int flags)
 
 			v = __raw_readl(usbother_base + MXC_USBCTRL_OFFSET);
 			if (flags & MXC_EHCI_POWER_PINS_ENABLED)
-				v |= MXC_OTG_UCTRL_OPM_BIT;
-			else
 				v &= ~MXC_OTG_UCTRL_OPM_BIT;
+			else
+				v |= MXC_OTG_UCTRL_OPM_BIT;
 			__raw_writel(v, usbother_base + MXC_USBCTRL_OFFSET);
 		}
 		break;