diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-10 15:50:07 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-17 04:01:37 -0500 |
commit | 224b8c83641c2f31e3efc9bc5956636cc42cadf7 (patch) | |
tree | 831e4ee5c1099cc7cb5cef3159f00bbb718c18de /arch/arm/mach-mx25/mach-cpuimx25.c | |
parent | 2c20b9f19add2248dc867f1f78dcef1eb0944543 (diff) |
ARM: mx25: dynamically allocate fsl-usb2-udc devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx25/mach-cpuimx25.c')
-rw-r--r-- | arch/arm/mach-mx25/mach-cpuimx25.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-mx25/mach-cpuimx25.c b/arch/arm/mach-mx25/mach-cpuimx25.c index 0ee0fe73952d..2094bddb3e47 100644 --- a/arch/arm/mach-mx25/mach-cpuimx25.c +++ b/arch/arm/mach-mx25/mach-cpuimx25.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/platform_device.h> | 26 | #include <linux/platform_device.h> |
27 | #include <linux/usb/otg.h> | 27 | #include <linux/usb/otg.h> |
28 | #include <linux/usb/ulpi.h> | 28 | #include <linux/usb/ulpi.h> |
29 | #include <linux/fsl_devices.h> | ||
30 | 29 | ||
31 | #include <mach/eukrea-baseboards.h> | 30 | #include <mach/eukrea-baseboards.h> |
32 | #include <mach/hardware.h> | 31 | #include <mach/hardware.h> |
@@ -97,7 +96,7 @@ static const struct mxc_usbh_platform_data usbh2_pdata __initconst = { | |||
97 | MXC_EHCI_IPPUE_DOWN, | 96 | MXC_EHCI_IPPUE_DOWN, |
98 | }; | 97 | }; |
99 | 98 | ||
100 | static struct fsl_usb2_platform_data otg_device_pdata = { | 99 | static const struct fsl_usb2_platform_data otg_device_pdata __initconst = { |
101 | .operating_mode = FSL_USB2_DR_DEVICE, | 100 | .operating_mode = FSL_USB2_DR_DEVICE, |
102 | .phy_mode = FSL_USB2_PHY_UTMI, | 101 | .phy_mode = FSL_USB2_PHY_UTMI, |
103 | }; | 102 | }; |
@@ -135,7 +134,7 @@ static void __init eukrea_cpuimx25_init(void) | |||
135 | if (otg_mode_host) | 134 | if (otg_mode_host) |
136 | imx25_add_mxc_ehci_otg(&otg_pdata); | 135 | imx25_add_mxc_ehci_otg(&otg_pdata); |
137 | else | 136 | else |
138 | mxc_register_device(&otg_udc_device, &otg_device_pdata); | 137 | imx25_add_fsl_usb2_udc(&otg_device_pdata); |
139 | 138 | ||
140 | imx25_add_mxc_ehci_hs(&usbh2_pdata); | 139 | imx25_add_mxc_ehci_hs(&usbh2_pdata); |
141 | 140 | ||