diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3stalker.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3stalker.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index bc5ac83bd4cf..f25272125413 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c | |||
@@ -26,6 +26,7 @@ | |||
26 | 26 | ||
27 | #include <linux/regulator/machine.h> | 27 | #include <linux/regulator/machine.h> |
28 | #include <linux/i2c/twl.h> | 28 | #include <linux/i2c/twl.h> |
29 | #include <linux/mmc/host.h> | ||
29 | 30 | ||
30 | #include <mach/hardware.h> | 31 | #include <mach/hardware.h> |
31 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
@@ -38,7 +39,6 @@ | |||
38 | #include <plat/gpmc.h> | 39 | #include <plat/gpmc.h> |
39 | #include <plat/nand.h> | 40 | #include <plat/nand.h> |
40 | #include <plat/usb.h> | 41 | #include <plat/usb.h> |
41 | #include <plat/timer-gp.h> | ||
42 | #include <plat/display.h> | 42 | #include <plat/display.h> |
43 | 43 | ||
44 | #include <plat/mcspi.h> | 44 | #include <plat/mcspi.h> |
@@ -52,6 +52,7 @@ | |||
52 | #include "sdram-micron-mt46h32m32lf-6.h" | 52 | #include "sdram-micron-mt46h32m32lf-6.h" |
53 | #include "mux.h" | 53 | #include "mux.h" |
54 | #include "hsmmc.h" | 54 | #include "hsmmc.h" |
55 | #include "timer-gp.h" | ||
55 | 56 | ||
56 | #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) | 57 | #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) |
57 | #define OMAP3STALKER_ETHR_START 0x2c000000 | 58 | #define OMAP3STALKER_ETHR_START 0x2c000000 |
@@ -275,7 +276,7 @@ static struct regulator_init_data omap3stalker_vsim = { | |||
275 | static struct omap2_hsmmc_info mmc[] = { | 276 | static struct omap2_hsmmc_info mmc[] = { |
276 | { | 277 | { |
277 | .mmc = 1, | 278 | .mmc = 1, |
278 | .wires = 4, | 279 | .caps = MMC_CAP_4_BIT_DATA, |
279 | .gpio_cd = -EINVAL, | 280 | .gpio_cd = -EINVAL, |
280 | .gpio_wp = 23, | 281 | .gpio_wp = 23, |
281 | }, | 282 | }, |
@@ -389,7 +390,7 @@ static struct twl4030_usb_data omap3stalker_usb_data = { | |||
389 | .usb_mode = T2_USB_MODE_ULPI, | 390 | .usb_mode = T2_USB_MODE_ULPI, |
390 | }; | 391 | }; |
391 | 392 | ||
392 | static int board_keymap[] = { | 393 | static uint32_t board_keymap[] = { |
393 | KEY(0, 0, KEY_LEFT), | 394 | KEY(0, 0, KEY_LEFT), |
394 | KEY(0, 1, KEY_DOWN), | 395 | KEY(0, 1, KEY_DOWN), |
395 | KEY(0, 2, KEY_ENTER), | 396 | KEY(0, 2, KEY_ENTER), |
@@ -564,7 +565,7 @@ static struct omap2_mcspi_device_config ads7846_mcspi_config = { | |||
564 | .single_channel = 1, /* 0: slave, 1: master */ | 565 | .single_channel = 1, /* 0: slave, 1: master */ |
565 | }; | 566 | }; |
566 | 567 | ||
567 | struct spi_board_info omap3stalker_spi_board_info[] = { | 568 | static struct spi_board_info omap3stalker_spi_board_info[] = { |
568 | [0] = { | 569 | [0] = { |
569 | .modalias = "ads7846", | 570 | .modalias = "ads7846", |
570 | .bus_num = 1, | 571 | .bus_num = 1, |