aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3/mach-cpuimx35.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-11-15 05:57:49 -0500
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-11-19 15:54:35 -0500
commit2d58de2805f93bdb8fa0608d98e1871bb28ec091 (patch)
treec02b9ce615ef49dea30cae203f4a6fbceb668daa /arch/arm/mach-mx3/mach-cpuimx35.c
parent9e1dde33876ba83ad586c336647fff133d0f5472 (diff)
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/mach-cpuimx35.c')
-rw-r--r--arch/arm/mach-mx3/mach-cpuimx35.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-mx3/mach-cpuimx35.c b/arch/arm/mach-mx3/mach-cpuimx35.c
index b8b619a0e07c..0af1e84d8f9d 100644
--- a/arch/arm/mach-mx3/mach-cpuimx35.c
+++ b/arch/arm/mach-mx3/mach-cpuimx35.c
@@ -42,7 +42,6 @@
42#include <mach/common.h> 42#include <mach/common.h>
43#include <mach/iomux-mx35.h> 43#include <mach/iomux-mx35.h>
44#include <mach/mxc_nand.h> 44#include <mach/mxc_nand.h>
45#include <mach/mxc_ehci.h>
46 45
47#include "devices-imx35.h" 46#include "devices-imx35.h"
48#include "devices.h" 47#include "devices.h"
@@ -116,12 +115,12 @@ static const struct mxc_nand_platform_data
116 .flash_bbt = 1, 115 .flash_bbt = 1,
117}; 116};
118 117
119static struct mxc_usbh_platform_data __maybe_unused otg_pdata = { 118static const struct mxc_usbh_platform_data otg_pdata __initconst = {
120 .portsc = MXC_EHCI_MODE_UTMI, 119 .portsc = MXC_EHCI_MODE_UTMI,
121 .flags = MXC_EHCI_INTERFACE_DIFF_UNI, 120 .flags = MXC_EHCI_INTERFACE_DIFF_UNI,
122}; 121};
123 122
124static struct mxc_usbh_platform_data __maybe_unused usbh1_pdata = { 123static const struct mxc_usbh_platform_data usbh1_pdata __initconst = {
125 .portsc = MXC_EHCI_MODE_SERIAL, 124 .portsc = MXC_EHCI_MODE_SERIAL,
126 .flags = MXC_EHCI_INTERFACE_SINGLE_UNI | MXC_EHCI_INTERNAL_PHY | 125 .flags = MXC_EHCI_INTERFACE_SINGLE_UNI | MXC_EHCI_INTERNAL_PHY |
127 MXC_EHCI_IPPUE_DOWN, 126 MXC_EHCI_IPPUE_DOWN,
@@ -167,11 +166,11 @@ static void __init mxc_board_init(void)
167 imx35_add_imx_i2c0(&eukrea_cpuimx35_i2c0_data); 166 imx35_add_imx_i2c0(&eukrea_cpuimx35_i2c0_data);
168 167
169 if (otg_mode_host) 168 if (otg_mode_host)
170 mxc_register_device(&mxc_otg_host, &otg_pdata); 169 imx35_add_mxc_ehci_otg(&otg_pdata);
171 else 170 else
172 imx35_add_fsl_usb2_udc(&otg_device_pdata); 171 imx35_add_fsl_usb2_udc(&otg_device_pdata);
173 172
174 mxc_register_device(&mxc_usbh1, &usbh1_pdata); 173 imx35_add_mxc_ehci_hs(&usbh1_pdata);
175 174
176#ifdef CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD 175#ifdef CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD
177 eukrea_mbimxsd35_baseboard_init(); 176 eukrea_mbimxsd35_baseboard_init();