diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-09 11:52:14 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-17 04:01:32 -0500 |
commit | bd455ed36c487b949068182bfee478b785ee090b (patch) | |
tree | fbee7b69033757465dc673c031ab2304b43a7fab /arch/arm/mach-imx/mach-cpuimx27.c | |
parent | 2eb42d5c287f5e883a4b3ebe668ba880caa351e5 (diff) |
ARM: imx: dynamically allocate fsl-usb2-udc devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-cpuimx27.c')
-rw-r--r-- | arch/arm/mach-imx/mach-cpuimx27.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c index c70b0382363e..9ae5bed90ed8 100644 --- a/arch/arm/mach-imx/mach-cpuimx27.c +++ b/arch/arm/mach-imx/mach-cpuimx27.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <linux/serial_8250.h> | 28 | #include <linux/serial_8250.h> |
29 | #include <linux/usb/otg.h> | 29 | #include <linux/usb/otg.h> |
30 | #include <linux/usb/ulpi.h> | 30 | #include <linux/usb/ulpi.h> |
31 | #include <linux/fsl_devices.h> | ||
32 | 31 | ||
33 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
34 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
@@ -223,7 +222,7 @@ static struct mxc_usbh_platform_data usbh2_pdata __initdata = { | |||
223 | }; | 222 | }; |
224 | #endif | 223 | #endif |
225 | 224 | ||
226 | static struct fsl_usb2_platform_data otg_device_pdata = { | 225 | static const struct fsl_usb2_platform_data otg_device_pdata __initconst = { |
227 | .operating_mode = FSL_USB2_DR_DEVICE, | 226 | .operating_mode = FSL_USB2_DR_DEVICE, |
228 | .phy_mode = FSL_USB2_PHY_ULPI, | 227 | .phy_mode = FSL_USB2_PHY_ULPI, |
229 | }; | 228 | }; |
@@ -289,7 +288,7 @@ static void __init eukrea_cpuimx27_init(void) | |||
289 | imx27_add_mxc_ehci_hs(2, &usbh2_pdata); | 288 | imx27_add_mxc_ehci_hs(2, &usbh2_pdata); |
290 | #endif | 289 | #endif |
291 | if (!otg_mode_host) | 290 | if (!otg_mode_host) |
292 | mxc_register_device(&mxc_otg_udc_device, &otg_device_pdata); | 291 | imx27_add_fsl_usb2_udc(&otg_device_pdata); |
293 | 292 | ||
294 | #ifdef CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD | 293 | #ifdef CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD |
295 | eukrea_mbimx27_baseboard_init(); | 294 | eukrea_mbimx27_baseboard_init(); |