plat-mxc/ehci.c: fix compile breakage

commits 2eb42d5c287f5e883a4b3ebe668ba880caa351e5 and
9e1dde33876ba83ad586c336647fff133d0f5472 renamed some defines
but didn't fix all the places where these defines are used
leading to a compile failure for USB on i.MX31, 35 and 27.

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

diff --git a/arch/arm/plat-mxc/ehci.c b/arch/arm/plat-mxc/ehci.c
index 4bac3d5545d368498cb77210f50dc62b53ffb8d8..b79c8090197c84b00637ca32c906796dabe28450 100644 (file)
--- a/arch/arm/plat-mxc/ehci.c
+++ b/arch/arm/plat-mxc/ehci.c
@@ -115,7 +115,7 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)
 #endif /* if defined(CONFIG_SOC_IMX25) */
 #if defined(CONFIG_ARCH_MX3)
        if (cpu_is_mx31()) {
-               v = readl(MX31_IO_ADDRESS(MX31_OTG_BASE_ADDR +
+               v = readl(MX31_IO_ADDRESS(MX31_USB_BASE_ADDR +
                                     USBCTRL_OTGBASE_OFFSET));
 
                switch (port) {
@@ -153,13 +153,13 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)
                        return -EINVAL;
                }
 
-               writel(v, MX31_IO_ADDRESS(MX31_OTG_BASE_ADDR +
+               writel(v, MX31_IO_ADDRESS(MX31_USB_BASE_ADDR +
                                     USBCTRL_OTGBASE_OFFSET));
                return 0;
        }
 
        if (cpu_is_mx35()) {
-               v = readl(MX35_IO_ADDRESS(MX35_OTG_BASE_ADDR +
+               v = readl(MX35_IO_ADDRESS(MX35_USB_BASE_ADDR +
                                     USBCTRL_OTGBASE_OFFSET));
 
                switch (port) {
@@ -196,7 +196,7 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)
                        return -EINVAL;
                }
 
-               writel(v, MX35_IO_ADDRESS(MX35_OTG_BASE_ADDR +
+               writel(v, MX35_IO_ADDRESS(MX35_USB_BASE_ADDR +
                                     USBCTRL_OTGBASE_OFFSET));
                return 0;
        }
@@ -206,7 +206,7 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)
                /* On i.MX27 we can use the i.MX31 USBCTRL bits, they
                 * are identical
                 */
-               v = readl(MX27_IO_ADDRESS(MX27_OTG_BASE_ADDR +
+               v = readl(MX27_IO_ADDRESS(MX27_USB_BASE_ADDR +
                                     USBCTRL_OTGBASE_OFFSET));
                switch (port) {
                case 0: /* OTG port */
@@ -241,7 +241,7 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)
                default:
                        return -EINVAL;
                }
-               writel(v, MX27_IO_ADDRESS(MX27_OTG_BASE_ADDR +
+               writel(v, MX27_IO_ADDRESS(MX27_USB_BASE_ADDR +
                                     USBCTRL_OTGBASE_OFFSET));
                return 0;
        }

diff --git a/drivers/usb/gadget/fsl_mxc_udc.c b/drivers/usb/gadget/fsl_mxc_udc.c
index 5bdbfe6198537d76da36d6077e9d1ac786c5a7fc..77b1eb57702969a19645680684c27b3f39bd717f 100644 (file)
--- a/drivers/usb/gadget/fsl_mxc_udc.c
+++ b/drivers/usb/gadget/fsl_mxc_udc.c
@@ -93,9 +93,9 @@ void fsl_udc_clk_finalize(struct platform_device *pdev)
 
        /* workaround ENGcm09152 for i.MX35 */
        if (pdata->workaround & FLS_USB2_WORKAROUND_ENGCM09152) {
-               v = readl(MX35_IO_ADDRESS(MX35_OTG_BASE_ADDR +
+               v = readl(MX35_IO_ADDRESS(MX35_USB_BASE_ADDR +
                                USBPHYCTRL_OTGBASE_OFFSET));
-               writel(v | USBPHYCTRL_EVDO, MX35_IO_ADDRESS(MX35_OTG_BASE_ADDR +
+               writel(v | USBPHYCTRL_EVDO, MX35_IO_ADDRESS(MX35_USB_BASE_ADDR +
                                USBPHYCTRL_OTGBASE_OFFSET));
        }
 #endif