diff options
| author | Eric Bénard <eric@eukrea.com> | 2010-10-05 18:02:30 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-19 18:44:58 +0200 |
| commit | 52d084fc90f754a7aed7e7d6e1484be45454aba3 (patch) | |
| tree | f90f2319373e0e73d0a696c98b01df5c0ee3092b /arch/arm/mach-mx25/mach-cpuimx25.c | |
| parent | i.MX31 and i.MX35 : fix errate TLSbo65953 and ENGcm09472 (diff) | |
| download | linux-52d084fc90f754a7aed7e7d6e1484be45454aba3.tar.xz linux-52d084fc90f754a7aed7e7d6e1484be45454aba3.zip | |
cpuimx25 & cpuimx35: fix OTG port registration in host mode
the PHY is UTMI so don't create an ULPI viewpoint.
Signed-off-by: Eric Bénard <eric@eukrea.com>
Diffstat (limited to 'arch/arm/mach-mx25/mach-cpuimx25.c')
| -rw-r--r-- | arch/arm/mach-mx25/mach-cpuimx25.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/arm/mach-mx25/mach-cpuimx25.c b/arch/arm/mach-mx25/mach-cpuimx25.c index 21d9b9e9c92c..3b28a75007ad 100644 --- a/arch/arm/mach-mx25/mach-cpuimx25.c +++ b/arch/arm/mach-mx25/mach-cpuimx25.c @@ -40,7 +40,6 @@ #include <mach/mxc_nand.h> #include <mach/imxfb.h> #include <mach/mxc_ehci.h> -#include <mach/ulpi.h> #include <mach/iomux-mx25.h> #include "devices-imx25.h" @@ -134,18 +133,13 @@ static void __init eukrea_cpuimx25_init(void) ARRAY_SIZE(eukrea_cpuimx25_i2c_devices)); imx25_add_imx_i2c0(&eukrea_cpuimx25_i2c0_data); -#if defined(CONFIG_USB_ULPI) - if (otg_mode_host) { - otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, - ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); - + if (otg_mode_host) mxc_register_device(&mxc_otg, &otg_pdata); - } - mxc_register_device(&mxc_usbh2, &usbh2_pdata); -#endif - if (!otg_mode_host) + else mxc_register_device(&otg_udc_device, &otg_device_pdata); + mxc_register_device(&mxc_usbh2, &usbh2_pdata); + #ifdef CONFIG_MACH_EUKREA_MBIMXSD25_BASEBOARD eukrea_mbimxsd25_baseboard_init(); #endif |