aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3/mach-pcm037.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-11-12 10:40:06 -0500
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-11-19 15:54:35 -0500
commit9e1dde33876ba83ad586c336647fff133d0f5472 (patch)
tree52aa4efe87f2f52234f2f55e3a2b29e61de683c9 /arch/arm/mach-mx3/mach-pcm037.c
parentfed3d35b06bf3f6a3383c2637d054823c563200b (diff)
ARM: mx3: dynamically allocate fsl-usb2-udc devices
While adapting the #defines for this I noticed that the offset used for USB HS on i.MX35 differs from the documented offset. I kept the working offset and commented that the documentation differs. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mach-pcm037.c')
-rw-r--r--arch/arm/mach-mx3/mach-pcm037.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-mx3/mach-pcm037.c
index 2ba4f2b9480b..20f7f9485dc6 100644
--- a/arch/arm/mach-mx3/mach-pcm037.c
+++ b/arch/arm/mach-mx3/mach-pcm037.c
@@ -27,7 +27,6 @@
27#include <linux/delay.h> 27#include <linux/delay.h>
28#include <linux/spi/spi.h> 28#include <linux/spi/spi.h>
29#include <linux/irq.h> 29#include <linux/irq.h>
30#include <linux/fsl_devices.h>
31#include <linux/can/platform/sja1000.h> 30#include <linux/can/platform/sja1000.h>
32#include <linux/usb/otg.h> 31#include <linux/usb/otg.h>
33#include <linux/usb/ulpi.h> 32#include <linux/usb/ulpi.h>
@@ -550,7 +549,7 @@ static struct mxc_usbh_platform_data usbh2_pdata = {
550}; 549};
551#endif 550#endif
552 551
553static struct fsl_usb2_platform_data otg_device_pdata = { 552static const struct fsl_usb2_platform_data otg_device_pdata __initconst = {
554 .operating_mode = FSL_USB2_DR_DEVICE, 553 .operating_mode = FSL_USB2_DR_DEVICE,
555 .phy_mode = FSL_USB2_PHY_ULPI, 554 .phy_mode = FSL_USB2_PHY_ULPI,
556}; 555};
@@ -664,7 +663,7 @@ static void __init mxc_board_init(void)
664 mxc_register_device(&mxc_usbh2, &usbh2_pdata); 663 mxc_register_device(&mxc_usbh2, &usbh2_pdata);
665#endif 664#endif
666 if (!otg_mode_host) 665 if (!otg_mode_host)
667 mxc_register_device(&mxc_otg_udc_device, &otg_device_pdata); 666 imx31_add_fsl_usb2_udc(&otg_device_pdata);
668 667
669} 668}
670 669