aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-01-14 05:19:35 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2011-01-27 06:51:14 -0500
commit070ed7335961825f6c1a137b929c67627c31c907 (patch)
treeb3a461a962394e398be46afd6729bb6a52325efe
parent0fbfd987ffd5e0b0d137a5684d4865bb1efac6a3 (diff)
ARM i.MX35 pcm043: put usbh1 outside CONFIG_USB_ULPI
The usbh1 port of the pcm043 does not use ulpi, so put it outside the corresponding ifdefs. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-mx3/mach-pcm043.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-mx3/mach-pcm043.c
index a27022d15c27..a515290f15fc 100644
--- a/arch/arm/mach-mx3/mach-pcm043.c
+++ b/arch/arm/mach-mx3/mach-pcm043.c
@@ -310,13 +310,13 @@ static struct mxc_usbh_platform_data otg_pdata __initdata = {
310 .portsc = MXC_EHCI_MODE_UTMI, 310 .portsc = MXC_EHCI_MODE_UTMI,
311 .flags = MXC_EHCI_INTERFACE_DIFF_UNI, 311 .flags = MXC_EHCI_INTERFACE_DIFF_UNI,
312}; 312};
313#endif
313 314
314static const struct mxc_usbh_platform_data usbh1_pdata __initconst = { 315static const struct mxc_usbh_platform_data usbh1_pdata __initconst = {
315 .portsc = MXC_EHCI_MODE_SERIAL, 316 .portsc = MXC_EHCI_MODE_SERIAL,
316 .flags = MXC_EHCI_INTERFACE_SINGLE_UNI | MXC_EHCI_INTERNAL_PHY | 317 .flags = MXC_EHCI_INTERFACE_SINGLE_UNI | MXC_EHCI_INTERNAL_PHY |
317 MXC_EHCI_IPPUE_DOWN, 318 MXC_EHCI_IPPUE_DOWN,
318}; 319};
319#endif
320 320
321static const struct fsl_usb2_platform_data otg_device_pdata __initconst = { 321static const struct fsl_usb2_platform_data otg_device_pdata __initconst = {
322 .operating_mode = FSL_USB2_DR_DEVICE, 322 .operating_mode = FSL_USB2_DR_DEVICE,
@@ -382,9 +382,9 @@ static void __init mxc_board_init(void)
382 382
383 imx35_add_mxc_ehci_otg(&otg_pdata); 383 imx35_add_mxc_ehci_otg(&otg_pdata);
384 } 384 }
385
386 imx35_add_mxc_ehci_hs(&usbh1_pdata);
387#endif 385#endif
386 imx35_add_mxc_ehci_hs(&usbh1_pdata);
387
388 if (!otg_mode_host) 388 if (!otg_mode_host)
389 imx35_add_fsl_usb2_udc(&otg_device_pdata); 389 imx35_add_fsl_usb2_udc(&otg_device_pdata);
390 390