diff options
Diffstat (limited to 'arch/arm/mach-imx/mach-mx27_3ds.c')
-rw-r--r-- | arch/arm/mach-imx/mach-mx27_3ds.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c index 6fd0f8f6deb6..164331518bdd 100644 --- a/arch/arm/mach-imx/mach-mx27_3ds.c +++ b/arch/arm/mach-imx/mach-mx27_3ds.c | |||
@@ -37,12 +37,15 @@ | |||
37 | #include <mach/common.h> | 37 | #include <mach/common.h> |
38 | #include <mach/iomux-mx27.h> | 38 | #include <mach/iomux-mx27.h> |
39 | #include <mach/ulpi.h> | 39 | #include <mach/ulpi.h> |
40 | #include <mach/irqs.h> | ||
41 | #include <mach/3ds_debugboard.h> | ||
40 | 42 | ||
41 | #include "devices-imx27.h" | 43 | #include "devices-imx27.h" |
42 | 44 | ||
43 | #define SD1_EN_GPIO (GPIO_PORTB + 25) | 45 | #define SD1_EN_GPIO (GPIO_PORTB + 25) |
44 | #define OTG_PHY_RESET_GPIO (GPIO_PORTB + 23) | 46 | #define OTG_PHY_RESET_GPIO (GPIO_PORTB + 23) |
45 | #define SPI2_SS0 (GPIO_PORTD + 21) | 47 | #define SPI2_SS0 (GPIO_PORTD + 21) |
48 | #define EXPIO_PARENT_INT (MXC_INTERNAL_IRQS + GPIO_PORTC + 28) | ||
46 | 49 | ||
47 | static const int mx27pdk_pins[] __initconst = { | 50 | static const int mx27pdk_pins[] __initconst = { |
48 | /* UART1 */ | 51 | /* UART1 */ |
@@ -215,10 +218,10 @@ static struct regulator_init_data vgen_init = { | |||
215 | 218 | ||
216 | static struct mc13783_regulator_init_data mx27_3ds_regulators[] = { | 219 | static struct mc13783_regulator_init_data mx27_3ds_regulators[] = { |
217 | { | 220 | { |
218 | .id = MC13783_REGU_VMMC1, | 221 | .id = MC13783_REG_VMMC1, |
219 | .init_data = &vmmc1_init, | 222 | .init_data = &vmmc1_init, |
220 | }, { | 223 | }, { |
221 | .id = MC13783_REGU_VGEN, | 224 | .id = MC13783_REG_VGEN, |
222 | .init_data = &vgen_init, | 225 | .init_data = &vgen_init, |
223 | }, | 226 | }, |
224 | }; | 227 | }; |
@@ -276,6 +279,9 @@ static void __init mx27pdk_init(void) | |||
276 | imx27_add_spi_imx1(&spi2_pdata); | 279 | imx27_add_spi_imx1(&spi2_pdata); |
277 | spi_register_board_info(mx27_3ds_spi_devs, | 280 | spi_register_board_info(mx27_3ds_spi_devs, |
278 | ARRAY_SIZE(mx27_3ds_spi_devs)); | 281 | ARRAY_SIZE(mx27_3ds_spi_devs)); |
282 | |||
283 | if (mxc_expio_init(MX27_CS5_BASE_ADDR, EXPIO_PARENT_INT)) | ||
284 | pr_warn("Init of the debugboard failed, all devices on the debugboard are unusable.\n"); | ||
279 | } | 285 | } |
280 | 286 | ||
281 | static void __init mx27pdk_timer_init(void) | 287 | static void __init mx27pdk_timer_init(void) |