From: Benoît Thébaudeau Date: Tue, 13 Nov 2012 09:56:30 +0000 (+0000) Subject: ehci-mx5: Fix OC_DIS usage X-Git-Tag: v2013.01-rc3~9^2~3^2~27 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7d42432d38af11f9d05398c3b6d29a54ab3322c8;p=oweals%2Fu-boot.git 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 Cc: Marek Vasut Cc: Stefano Babic --- 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);