diff options
author | Philippe Rétornaz <philippe.retornaz@epfl.ch> | 2010-05-11 10:57:50 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-05-17 04:05:50 -0400 |
commit | 66c202ad9a58905e0e6a0fa3976020a7ab0fa6df (patch) | |
tree | c8559ce3f8e34002228844a21172f499935f291f /arch/arm/mach-mx3/mx31moboard-marxbot.c | |
parent | 25783602050600b294086d6a0be9a0c2cfe8a3e3 (diff) |
mx31moboard: Move usb OTG device registration
In preparation for a new robot which needs the
OTG port as host.
This moves the OTG device registration into board
initialisation.
Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch>
Acked-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mx31moboard-marxbot.c')
-rw-r--r-- | arch/arm/mach-mx3/mx31moboard-marxbot.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard-marxbot.c b/arch/arm/mach-mx3/mx31moboard-marxbot.c index ffb105e14d88..4930f8c27e66 100644 --- a/arch/arm/mach-mx3/mx31moboard-marxbot.c +++ b/arch/arm/mach-mx3/mx31moboard-marxbot.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
26 | #include <linux/platform_device.h> | 26 | #include <linux/platform_device.h> |
27 | #include <linux/types.h> | 27 | #include <linux/types.h> |
28 | #include <linux/fsl_devices.h> | ||
28 | 29 | ||
29 | #include <linux/usb/otg.h> | 30 | #include <linux/usb/otg.h> |
30 | 31 | ||
@@ -329,6 +330,11 @@ static int __init marxbot_usbh1_init(void) | |||
329 | return mxc_register_device(&mxc_usbh1, &usbh1_pdata); | 330 | return mxc_register_device(&mxc_usbh1, &usbh1_pdata); |
330 | } | 331 | } |
331 | 332 | ||
333 | static struct fsl_usb2_platform_data usb_pdata = { | ||
334 | .operating_mode = FSL_USB2_DR_DEVICE, | ||
335 | .phy_mode = FSL_USB2_PHY_ULPI, | ||
336 | }; | ||
337 | |||
332 | /* | 338 | /* |
333 | * system init for baseboard usage. Will be called by mx31moboard init. | 339 | * system init for baseboard usage. Will be called by mx31moboard init. |
334 | */ | 340 | */ |
@@ -356,5 +362,7 @@ void __init mx31moboard_marxbot_init(void) | |||
356 | gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_LCS0)); | 362 | gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_LCS0)); |
357 | gpio_export(IOMUX_TO_GPIO(MX31_PIN_LCS0), false); | 363 | gpio_export(IOMUX_TO_GPIO(MX31_PIN_LCS0), false); |
358 | 364 | ||
365 | mxc_register_device(&mxc_otg_udc_device, &usb_pdata); | ||
366 | |||
359 | marxbot_usbh1_init(); | 367 | marxbot_usbh1_init(); |
360 | } | 368 | } |