diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-14 11:19:35 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-27 12:51:14 +0100 |
| commit | 070ed7335961825f6c1a137b929c67627c31c907 (patch) | |
| tree | b3a461a962394e398be46afd6729bb6a52325efe /arch/arm/mach-mx3 | |
| parent | 0fbfd987ffd5e0b0d137a5684d4865bb1efac6a3 (diff) | |
| download | kernel_samsung_aries-070ed7335961825f6c1a137b929c67627c31c907.zip kernel_samsung_aries-070ed7335961825f6c1a137b929c67627c31c907.tar.gz kernel_samsung_aries-070ed7335961825f6c1a137b929c67627c31c907.tar.bz2 | |
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>
Diffstat (limited to 'arch/arm/mach-mx3')
| -rw-r--r-- | arch/arm/mach-mx3/mach-pcm043.c | 6 |
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 a27022d..a515290 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 = { .portsc = MXC_EHCI_MODE_UTMI, .flags = MXC_EHCI_INTERFACE_DIFF_UNI, }; +#endif static const struct mxc_usbh_platform_data usbh1_pdata __initconst = { .portsc = MXC_EHCI_MODE_SERIAL, .flags = MXC_EHCI_INTERFACE_SINGLE_UNI | MXC_EHCI_INTERNAL_PHY | MXC_EHCI_IPPUE_DOWN, }; -#endif static const struct fsl_usb2_platform_data otg_device_pdata __initconst = { .operating_mode = FSL_USB2_DR_DEVICE, @@ -382,9 +382,9 @@ static void __init mxc_board_init(void) imx35_add_mxc_ehci_otg(&otg_pdata); } - - imx35_add_mxc_ehci_hs(&usbh1_pdata); #endif + imx35_add_mxc_ehci_hs(&usbh1_pdata); + if (!otg_mode_host) imx35_add_fsl_usb2_udc(&otg_device_pdata); |