diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3pandora.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3pandora.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index b3196107afdb..402f09c6cf10 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include <mach/gpio.h> | 34 | #include <mach/gpio.h> |
35 | #include <mach/hardware.h> | 35 | #include <mach/hardware.h> |
36 | #include <mach/mcspi.h> | 36 | #include <mach/mcspi.h> |
37 | #include <mach/usb.h> | ||
37 | 38 | ||
38 | #include "mmc-twl4030.h" | 39 | #include "mmc-twl4030.h" |
39 | 40 | ||
@@ -53,6 +54,13 @@ static struct twl4030_hsmmc_info omap3pandora_mmc[] = { | |||
53 | .gpio_cd = -EINVAL, | 54 | .gpio_cd = -EINVAL, |
54 | .gpio_wp = 127, | 55 | .gpio_wp = 127, |
55 | .ext_clock = 1, | 56 | .ext_clock = 1, |
57 | .transceiver = true, | ||
58 | }, | ||
59 | { | ||
60 | .mmc = 3, | ||
61 | .wires = 4, | ||
62 | .gpio_cd = -EINVAL, | ||
63 | .gpio_wp = -EINVAL, | ||
56 | }, | 64 | }, |
57 | {} /* Terminator */ | 65 | {} /* Terminator */ |
58 | }; | 66 | }; |
@@ -110,7 +118,7 @@ static int __init omap3pandora_i2c_init(void) | |||
110 | 118 | ||
111 | static void __init omap3pandora_init_irq(void) | 119 | static void __init omap3pandora_init_irq(void) |
112 | { | 120 | { |
113 | omap2_init_common_hw(); | 121 | omap2_init_common_hw(NULL); |
114 | omap_init_irq(); | 122 | omap_init_irq(); |
115 | omap_gpio_init(); | 123 | omap_gpio_init(); |
116 | } | 124 | } |
@@ -193,6 +201,7 @@ static void __init omap3pandora_init(void) | |||
193 | spi_register_board_info(omap3pandora_spi_board_info, | 201 | spi_register_board_info(omap3pandora_spi_board_info, |
194 | ARRAY_SIZE(omap3pandora_spi_board_info)); | 202 | ARRAY_SIZE(omap3pandora_spi_board_info)); |
195 | omap3pandora_ads7846_init(); | 203 | omap3pandora_ads7846_init(); |
204 | usb_musb_init(); | ||
196 | } | 205 | } |
197 | 206 | ||
198 | static void __init omap3pandora_map_io(void) | 207 | static void __init omap3pandora_map_io(void) |