summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Chen <peter.chen@freescale.com>2011-11-10 10:45:23 +0800
committerJason Liu <r64343@freescale.com>2012-07-20 13:17:38 +0800
commit13949965a4a4a58ba2e50b2d4ade4f418dfbc3ea (patch)
treed94b942a256f4b9878f3bdc34f24ebd360bd0804
parentf037cb9d7146ad24c74fde39b52435944f7b0ca5 (diff)
ENGR00161848 mx5x: usb: fix build error
Fix the build error for mx5x arch/arm/plat-mxc/usb_common.c: In function 'fsl_usb_host_init': arch/arm/plat-mxc/usb_common.c:526: error: 'UCTRL_OVER_CUR_POL' undeclared (first use in this function) arch/arm/plat-mxc/usb_common.c:526: error: (Each undeclared identifier is reported only once arch/arm/plat-mxc/usb_common.c:526: error: for each function it appears in.) arch/arm/plat-mxc/usb_common.c:529: error: 'UCTRL_OVER_CUR_DIS' undeclared (first use in this function) arch/arm/plat-mxc/usb_common.c: In function 'usbotg_init': arch/arm/plat-mxc/usb_common.c:840: error: 'UCTRL_OVER_CUR_POL' undeclared (first use in this function) arch/arm/plat-mxc/usb_common.c:843: error: 'UCTRL_OVER_CUR_DIS' undeclared (first use in this function) make[1]: *** [arch/arm/plat-mxc/usb_common.o] Error 1 make: *** [arch/arm/plat-mxc] Error 2 Signed-off-by: Peter Chen <peter.chen@freescale.com>
-rwxr-xr-xarch/arm/plat-mxc/usb_common.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/usb_common.c b/arch/arm/plat-mxc/usb_common.c
index 2c195d81ffb8..798aa9afeba5 100755
--- a/arch/arm/plat-mxc/usb_common.c
+++ b/arch/arm/plat-mxc/usb_common.c
@@ -521,6 +521,7 @@ int fsl_usb_host_init(struct platform_device *pdev)
usbh1_set_utmi_xcvr();
}
} else {
+#ifdef CONFIG_ARCH_MX6
if (!strcmp("Host 1", pdata->name)) {
if (machine_is_mx6q_arm2())
USB_H1_CTRL &= ~UCTRL_OVER_CUR_POL;
@@ -528,6 +529,7 @@ int fsl_usb_host_init(struct platform_device *pdev)
USB_H1_CTRL |= UCTRL_OVER_CUR_POL;
USB_H1_CTRL |= UCTRL_OVER_CUR_DIS;
}
+#endif
}
pr_debug("%s: %s success\n", __func__, pdata->name);
@@ -836,11 +838,13 @@ int usbotg_init(struct platform_device *pdev)
otg_set_utmi_xcvr();
}
} else {
+#ifdef CONFIG_ARCH_MX6
if (machine_is_mx6q_arm2())
USB_OTG_CTRL &= ~UCTRL_OVER_CUR_POL;
else if (machine_is_mx6q_sabrelite())
USB_OTG_CTRL |= UCTRL_OVER_CUR_POL;
USB_OTG_CTRL |= UCTRL_OVER_CUR_DIS;
+#endif
}
}