diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-15 11:57:49 +0100 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-19 21:54:35 +0100 |
| commit | 2d58de2805f93bdb8fa0608d98e1871bb28ec091 (patch) | |
| tree | c02b9ce615ef49dea30cae203f4a6fbceb668daa /arch/arm/mach-mx3/mx31moboard-smartbot.c | |
| parent | 9e1dde33876ba83ad586c336647fff133d0f5472 (diff) | |
| download | linux-2d58de2805f93bdb8fa0608d98e1871bb28ec091.tar.gz linux-2d58de2805f93bdb8fa0608d98e1871bb28ec091.tar.bz2 linux-2d58de2805f93bdb8fa0608d98e1871bb28ec091.zip | |
ARM: mx3: dynamically allocate mxc-ehci devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mx31moboard-smartbot.c')
| -rw-r--r-- | arch/arm/mach-mx3/mx31moboard-smartbot.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard-smartbot.c b/arch/arm/mach-mx3/mx31moboard-smartbot.c index 68e8ab55f4c7..8e989e5b3af6 100644 --- a/arch/arm/mach-mx3/mx31moboard-smartbot.c +++ b/arch/arm/mach-mx3/mx31moboard-smartbot.c @@ -27,7 +27,6 @@ #include <mach/hardware.h> #include <mach/iomux-mx3.h> #include <mach/board-mx31moboard.h> -#include <mach/mxc_ehci.h> #include <mach/ulpi.h> #include <media/soc_camera.h> @@ -125,17 +124,23 @@ static const struct fsl_usb2_platform_data usb_pdata __initconst = { #if defined(CONFIG_USB_ULPI) -static struct mxc_usbh_platform_data otg_host_pdata = { +static struct mxc_usbh_platform_data otg_host_pdata __initdata = { .portsc = MXC_EHCI_MODE_ULPI | MXC_EHCI_UTMI_8BIT, .flags = MXC_EHCI_POWER_PINS_ENABLED, }; static int __init smartbot_otg_host_init(void) { + struct platform_device *pdev; + otg_host_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); - return mxc_register_device(&mxc_otg_host, &otg_host_pdata); + pdev = imx31_add_mxc_ehci_otg(&otg_host_pdata); + if (IS_ERR(pdev)) + return PTR_ERR(pdev); + + return 0; } #else static inline int smartbot_otg_host_init(void) { return 0; } |