]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
ehci-mx5: Fix *PM usage for i.MX53
authorBenoît Thébaudeau <benoit.thebaudeau@advansee.com>
Tue, 13 Nov 2012 09:56:59 +0000 (09:56 +0000)
committerStefano Babic <sbabic@denx.de>
Fri, 16 Nov 2012 08:16:44 +0000 (09:16 +0100)
The MXC_*_UCTRL_*PM_BIT bits are available only on i.MX51.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
drivers/usb/host/ehci-mx5.c

index 8c1b70a87a45a67f30f60b462a2e857415b82870..4f4b98a14d2087b5c66b6b2e16c270dc7d58d165 100644 (file)
@@ -160,10 +160,12 @@ int mxc_set_usbcontrol(int port, unsigned int flags)
                                        MXC_USB_PHY_CTR_FUNC_OFFSET);
 
                        v = __raw_readl(usbother_base + MXC_USBCTRL_OFFSET);
+#ifdef CONFIG_MX51
                        if (flags & MXC_EHCI_POWER_PINS_ENABLED)
                                v &= ~MXC_OTG_UCTRL_OPM_BIT;
                        else
                                v |= MXC_OTG_UCTRL_OPM_BIT;
+#endif
                        __raw_writel(v, usbother_base + MXC_USBCTRL_OFFSET);
                }
                break;
@@ -177,10 +179,12 @@ int mxc_set_usbcontrol(int port, unsigned int flags)
 #endif
 
                v = __raw_readl(usbother_base + MXC_USBCTRL_OFFSET);
+#ifdef CONFIG_MX51
                if (flags & MXC_EHCI_POWER_PINS_ENABLED)
                        v &= ~MXC_H1_UCTRL_H1PM_BIT; /* H1 power mask unused */
                else
                        v |= MXC_H1_UCTRL_H1PM_BIT; /* H1 power mask used */
+#endif
                __raw_writel(v, usbother_base + MXC_USBCTRL_OFFSET);
 
                v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC_OFFSET);
@@ -193,11 +197,12 @@ int mxc_set_usbcontrol(int port, unsigned int flags)
                break;
        case 2: /* Host 2 ULPI */
                v = __raw_readl(usbother_base + MXC_USBH2CTRL_OFFSET);
+#ifdef CONFIG_MX51
                if (flags & MXC_EHCI_POWER_PINS_ENABLED)
                        v &= ~MXC_H2_UCTRL_H2PM_BIT; /* H2 power mask unused */
                else
                        v |= MXC_H2_UCTRL_H2PM_BIT; /* H2 power mask used */
-
+#endif
                __raw_writel(v, usbother_base + MXC_USBH2CTRL_OFFSET);
                break;
        }