diff options
-rw-r--r-- | arch/arm/mach-mx2/mach-pca100.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mx3/mach-pcm037.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mx3/mach-pcm043.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-mx2/mach-pca100.c b/arch/arm/mach-mx2/mach-pca100.c index a87422ed4ff5..7651d0ef4666 100644 --- a/arch/arm/mach-mx2/mach-pca100.c +++ b/arch/arm/mach-mx2/mach-pca100.c | |||
@@ -253,6 +253,7 @@ static struct imxmmc_platform_data sdhc_pdata = { | |||
253 | .exit = pca100_sdhc2_exit, | 253 | .exit = pca100_sdhc2_exit, |
254 | }; | 254 | }; |
255 | 255 | ||
256 | #if defined(CONFIG_USB_ULPI) | ||
256 | static int otg_phy_init(struct platform_device *pdev) | 257 | static int otg_phy_init(struct platform_device *pdev) |
257 | { | 258 | { |
258 | gpio_set_value(OTG_PHY_CS_GPIO, 0); | 259 | gpio_set_value(OTG_PHY_CS_GPIO, 0); |
@@ -276,6 +277,7 @@ static struct mxc_usbh_platform_data usbh2_pdata = { | |||
276 | .portsc = MXC_EHCI_MODE_ULPI, | 277 | .portsc = MXC_EHCI_MODE_ULPI, |
277 | .flags = MXC_EHCI_INTERFACE_DIFF_UNI, | 278 | .flags = MXC_EHCI_INTERFACE_DIFF_UNI, |
278 | }; | 279 | }; |
280 | #endif | ||
279 | 281 | ||
280 | static struct fsl_usb2_platform_data otg_device_pdata = { | 282 | static struct fsl_usb2_platform_data otg_device_pdata = { |
281 | .operating_mode = FSL_USB2_DR_DEVICE, | 283 | .operating_mode = FSL_USB2_DR_DEVICE, |
diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-mx3/mach-pcm037.c index 06cf61bca250..bb6c056854e9 100644 --- a/arch/arm/mach-mx3/mach-pcm037.c +++ b/arch/arm/mach-mx3/mach-pcm037.c | |||
@@ -545,6 +545,7 @@ static struct platform_device pcm970_sja1000 = { | |||
545 | .num_resources = ARRAY_SIZE(pcm970_sja1000_resources), | 545 | .num_resources = ARRAY_SIZE(pcm970_sja1000_resources), |
546 | }; | 546 | }; |
547 | 547 | ||
548 | #if defined(CONFIG_USB_ULPI) | ||
548 | static struct mxc_usbh_platform_data otg_pdata = { | 549 | static struct mxc_usbh_platform_data otg_pdata = { |
549 | .portsc = MXC_EHCI_MODE_ULPI, | 550 | .portsc = MXC_EHCI_MODE_ULPI, |
550 | .flags = MXC_EHCI_INTERFACE_DIFF_UNI, | 551 | .flags = MXC_EHCI_INTERFACE_DIFF_UNI, |
@@ -554,6 +555,7 @@ static struct mxc_usbh_platform_data usbh2_pdata = { | |||
554 | .portsc = MXC_EHCI_MODE_ULPI, | 555 | .portsc = MXC_EHCI_MODE_ULPI, |
555 | .flags = MXC_EHCI_INTERFACE_DIFF_UNI, | 556 | .flags = MXC_EHCI_INTERFACE_DIFF_UNI, |
556 | }; | 557 | }; |
558 | #endif | ||
557 | 559 | ||
558 | static struct fsl_usb2_platform_data otg_device_pdata = { | 560 | static struct fsl_usb2_platform_data otg_device_pdata = { |
559 | .operating_mode = FSL_USB2_DR_DEVICE, | 561 | .operating_mode = FSL_USB2_DR_DEVICE, |
diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-mx3/mach-pcm043.c index 78d9185a9d4b..8071b7281c4b 100644 --- a/arch/arm/mach-mx3/mach-pcm043.c +++ b/arch/arm/mach-mx3/mach-pcm043.c | |||
@@ -309,6 +309,7 @@ static struct mxc_nand_platform_data pcm037_nand_board_info = { | |||
309 | .hw_ecc = 1, | 309 | .hw_ecc = 1, |
310 | }; | 310 | }; |
311 | 311 | ||
312 | #if defined(CONFIG_USB_ULPI) | ||
312 | static struct mxc_usbh_platform_data otg_pdata = { | 313 | static struct mxc_usbh_platform_data otg_pdata = { |
313 | .portsc = MXC_EHCI_MODE_UTMI, | 314 | .portsc = MXC_EHCI_MODE_UTMI, |
314 | .flags = MXC_EHCI_INTERFACE_DIFF_UNI, | 315 | .flags = MXC_EHCI_INTERFACE_DIFF_UNI, |
@@ -319,6 +320,7 @@ static struct mxc_usbh_platform_data usbh1_pdata = { | |||
319 | .flags = MXC_EHCI_INTERFACE_SINGLE_UNI | MXC_EHCI_INTERNAL_PHY | | 320 | .flags = MXC_EHCI_INTERFACE_SINGLE_UNI | MXC_EHCI_INTERNAL_PHY | |
320 | MXC_EHCI_IPPUE_DOWN, | 321 | MXC_EHCI_IPPUE_DOWN, |
321 | }; | 322 | }; |
323 | #endif | ||
322 | 324 | ||
323 | static struct fsl_usb2_platform_data otg_device_pdata = { | 325 | static struct fsl_usb2_platform_data otg_device_pdata = { |
324 | .operating_mode = FSL_USB2_DR_DEVICE, | 326 | .operating_mode = FSL_USB2_DR_DEVICE, |