diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3stalker.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3stalker.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index b318f5602e36..b8756f0d2a08 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c | |||
@@ -28,14 +28,17 @@ | |||
28 | #include <linux/regulator/machine.h> | 28 | #include <linux/regulator/machine.h> |
29 | #include <linux/i2c/twl.h> | 29 | #include <linux/i2c/twl.h> |
30 | #include <linux/mmc/host.h> | 30 | #include <linux/mmc/host.h> |
31 | #include <linux/input/matrix_keypad.h> | ||
32 | #include <linux/spi/spi.h> | ||
33 | #include <linux/interrupt.h> | ||
34 | #include <linux/smsc911x.h> | ||
35 | #include <linux/i2c/at24.h> | ||
31 | 36 | ||
32 | #include <mach/hardware.h> | ||
33 | #include <asm/mach-types.h> | 37 | #include <asm/mach-types.h> |
34 | #include <asm/mach/arch.h> | 38 | #include <asm/mach/arch.h> |
35 | #include <asm/mach/map.h> | 39 | #include <asm/mach/map.h> |
36 | #include <asm/mach/flash.h> | 40 | #include <asm/mach/flash.h> |
37 | 41 | ||
38 | #include <plat/board.h> | ||
39 | #include "common.h" | 42 | #include "common.h" |
40 | #include <plat/gpmc.h> | 43 | #include <plat/gpmc.h> |
41 | #include <plat/nand.h> | 44 | #include <plat/nand.h> |
@@ -279,9 +282,6 @@ omap3stalker_twl_gpio_setup(struct device *dev, | |||
279 | } | 282 | } |
280 | 283 | ||
281 | static struct twl4030_gpio_platform_data omap3stalker_gpio_data = { | 284 | static struct twl4030_gpio_platform_data omap3stalker_gpio_data = { |
282 | .gpio_base = OMAP_MAX_GPIO_LINES, | ||
283 | .irq_base = TWL4030_GPIO_IRQ_BASE, | ||
284 | .irq_end = TWL4030_GPIO_IRQ_END, | ||
285 | .use_leds = true, | 285 | .use_leds = true, |
286 | .setup = omap3stalker_twl_gpio_setup, | 286 | .setup = omap3stalker_twl_gpio_setup, |
287 | }; | 287 | }; |
@@ -362,9 +362,6 @@ static int __init omap3_stalker_i2c_init(void) | |||
362 | 362 | ||
363 | #define OMAP3_STALKER_TS_GPIO 175 | 363 | #define OMAP3_STALKER_TS_GPIO 175 |
364 | 364 | ||
365 | static struct omap_board_config_kernel omap3_stalker_config[] __initdata = { | ||
366 | }; | ||
367 | |||
368 | static struct platform_device *omap3_stalker_devices[] __initdata = { | 365 | static struct platform_device *omap3_stalker_devices[] __initdata = { |
369 | &keys_gpio, | 366 | &keys_gpio, |
370 | }; | 367 | }; |
@@ -399,8 +396,6 @@ static void __init omap3_stalker_init(void) | |||
399 | { | 396 | { |
400 | regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies)); | 397 | regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies)); |
401 | omap3_mux_init(board_mux, OMAP_PACKAGE_CUS); | 398 | omap3_mux_init(board_mux, OMAP_PACKAGE_CUS); |
402 | omap_board_config = omap3_stalker_config; | ||
403 | omap_board_config_size = ARRAY_SIZE(omap3_stalker_config); | ||
404 | 399 | ||
405 | omap_mux_init_gpio(23, OMAP_PIN_INPUT); | 400 | omap_mux_init_gpio(23, OMAP_PIN_INPUT); |
406 | omap_hsmmc_init(mmc); | 401 | omap_hsmmc_init(mmc); |