diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2010-12-22 09:25:32 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-03 04:17:12 -0500 |
commit | 460d30a329a4186192598131505d9f75e6c5e2bc (patch) | |
tree | a84119919eec3265250c4db353b913824fdd8d27 /arch/arm/mach-imx | |
parent | 96cf4239c72af1fa099affc720731bad2f86927b (diff) |
ARM: imx/mx25_3ds: Add USB support
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx25_3ds.c | 14 |
2 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 9a715ce7c7b2..0449b80a6092 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
@@ -97,6 +97,7 @@ comment "MX25 platforms:" | |||
97 | config MACH_MX25_3DS | 97 | config MACH_MX25_3DS |
98 | bool "Support MX25PDK (3DS) Platform" | 98 | bool "Support MX25PDK (3DS) Platform" |
99 | select SOC_IMX25 | 99 | select SOC_IMX25 |
100 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | ||
100 | select IMX_HAVE_PLATFORM_IMX2_WDT | 101 | select IMX_HAVE_PLATFORM_IMX2_WDT |
101 | select IMX_HAVE_PLATFORM_IMXDI_RTC | 102 | select IMX_HAVE_PLATFORM_IMXDI_RTC |
102 | select IMX_HAVE_PLATFORM_IMX_FB | 103 | select IMX_HAVE_PLATFORM_IMX_FB |
diff --git a/arch/arm/mach-imx/mach-mx25_3ds.c b/arch/arm/mach-imx/mach-mx25_3ds.c index 8b8e75b93000..aa76cfd9f348 100644 --- a/arch/arm/mach-imx/mach-mx25_3ds.c +++ b/arch/arm/mach-imx/mach-mx25_3ds.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/gpio.h> | 30 | #include <linux/gpio.h> |
31 | #include <linux/platform_device.h> | 31 | #include <linux/platform_device.h> |
32 | #include <linux/input/matrix_keypad.h> | 32 | #include <linux/input/matrix_keypad.h> |
33 | #include <linux/usb/otg.h> | ||
33 | 34 | ||
34 | #include <mach/hardware.h> | 35 | #include <mach/hardware.h> |
35 | #include <asm/mach-types.h> | 36 | #include <asm/mach-types.h> |
@@ -184,13 +185,24 @@ static const struct matrix_keymap_data mx25pdk_keymap_data __initdata = { | |||
184 | .keymap_size = ARRAY_SIZE(mx25pdk_keymap), | 185 | .keymap_size = ARRAY_SIZE(mx25pdk_keymap), |
185 | }; | 186 | }; |
186 | 187 | ||
188 | static const struct mxc_usbh_platform_data usbh2_pdata __initconst = { | ||
189 | .portsc = MXC_EHCI_MODE_SERIAL, | ||
190 | .flags = MXC_EHCI_INTERNAL_PHY, | ||
191 | }; | ||
192 | |||
193 | static const struct fsl_usb2_platform_data otg_device_pdata __initconst = { | ||
194 | .operating_mode = FSL_USB2_DR_DEVICE, | ||
195 | .phy_mode = FSL_USB2_PHY_UTMI, | ||
196 | }; | ||
197 | |||
187 | static void __init mx25pdk_init(void) | 198 | static void __init mx25pdk_init(void) |
188 | { | 199 | { |
189 | mxc_iomux_v3_setup_multiple_pads(mx25pdk_pads, | 200 | mxc_iomux_v3_setup_multiple_pads(mx25pdk_pads, |
190 | ARRAY_SIZE(mx25pdk_pads)); | 201 | ARRAY_SIZE(mx25pdk_pads)); |
191 | 202 | ||
192 | imx25_add_imx_uart0(&uart_pdata); | 203 | imx25_add_imx_uart0(&uart_pdata); |
193 | imx25_add_mxc_ehci_hs(NULL); | 204 | imx25_add_fsl_usb2_udc(&otg_device_pdata); |
205 | imx25_add_mxc_ehci_hs(&usbh2_pdata); | ||
194 | imx25_add_mxc_nand(&mx25pdk_nand_board_info); | 206 | imx25_add_mxc_nand(&mx25pdk_nand_board_info); |
195 | imx25_add_imxdi_rtc(NULL); | 207 | imx25_add_imxdi_rtc(NULL); |
196 | imx25_add_imx_fb(&mx25pdk_fb_pdata); | 208 | imx25_add_imx_fb(&mx25pdk_fb_pdata); |