diff options
-rw-r--r-- | arch/arm/mach-omap1/board-h3.c | 22 | ||||
-rw-r--r-- | include/asm-arm/arch-omap/board-h3.h | 2 |
2 files changed, 23 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index 6fc516855a8c..c3ef1ee5f77b 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/mtd/nand.h> | 26 | #include <linux/mtd/nand.h> |
27 | #include <linux/mtd/partitions.h> | 27 | #include <linux/mtd/partitions.h> |
28 | #include <linux/input.h> | 28 | #include <linux/input.h> |
29 | #include <linux/spi/spi.h> | ||
29 | #include <linux/i2c/tps65010.h> | 30 | #include <linux/i2c/tps65010.h> |
30 | 31 | ||
31 | #include <asm/setup.h> | 32 | #include <asm/setup.h> |
@@ -51,6 +52,8 @@ | |||
51 | #include <asm/arch/mcbsp.h> | 52 | #include <asm/arch/mcbsp.h> |
52 | #include <asm/arch/omap-alsa.h> | 53 | #include <asm/arch/omap-alsa.h> |
53 | 54 | ||
55 | #define H3_TS_GPIO 48 | ||
56 | |||
54 | static int h3_keymap[] = { | 57 | static int h3_keymap[] = { |
55 | KEY(0, 0, KEY_LEFT), | 58 | KEY(0, 0, KEY_LEFT), |
56 | KEY(0, 1, KEY_RIGHT), | 59 | KEY(0, 1, KEY_RIGHT), |
@@ -373,6 +376,17 @@ static struct platform_device h3_lcd_device = { | |||
373 | .id = -1, | 376 | .id = -1, |
374 | }; | 377 | }; |
375 | 378 | ||
379 | static struct spi_board_info h3_spi_board_info[] __initdata = { | ||
380 | [0] = { | ||
381 | .modalias = "tsc2101", | ||
382 | .bus_num = 2, | ||
383 | .chip_select = 0, | ||
384 | .irq = OMAP_GPIO_IRQ(H3_TS_GPIO), | ||
385 | .max_speed_hz = 16000000, | ||
386 | /* .platform_data = &tsc_platform_data, */ | ||
387 | }, | ||
388 | }; | ||
389 | |||
376 | static struct omap_mcbsp_reg_cfg mcbsp_regs = { | 390 | static struct omap_mcbsp_reg_cfg mcbsp_regs = { |
377 | .spcr2 = FREE | FRST | GRST | XRST | XINTM(3), | 391 | .spcr2 = FREE | FRST | GRST | XRST | XINTM(3), |
378 | .spcr1 = RINTM(3) | RRST, | 392 | .spcr1 = RINTM(3) | RRST, |
@@ -457,6 +471,14 @@ static struct omap_board_config_kernel h3_config[] __initdata = { | |||
457 | { OMAP_TAG_LCD, &h3_lcd_config }, | 471 | { OMAP_TAG_LCD, &h3_lcd_config }, |
458 | }; | 472 | }; |
459 | 473 | ||
474 | static struct i2c_board_info __initdata h3_i2c_board_info[] = { | ||
475 | { | ||
476 | I2C_BOARD_INFO("tps65010", 0x48), | ||
477 | .type = "tps65013", | ||
478 | /* .irq = OMAP_GPIO_IRQ(??), */ | ||
479 | }, | ||
480 | }; | ||
481 | |||
460 | static struct omap_gpio_switch h3_gpio_switches[] __initdata = { | 482 | static struct omap_gpio_switch h3_gpio_switches[] __initdata = { |
461 | { | 483 | { |
462 | .name = "mmc_slot", | 484 | .name = "mmc_slot", |
diff --git a/include/asm-arm/arch-omap/board-h3.h b/include/asm-arm/arch-omap/board-h3.h index 1c2b55c61ca0..0f6404435ea8 100644 --- a/include/asm-arm/arch-omap/board-h3.h +++ b/include/asm-arm/arch-omap/board-h3.h | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | #define NR_IRQS (MAXIRQNUM + 1) | 37 | #define NR_IRQS (MAXIRQNUM + 1) |
38 | 38 | ||
39 | extern void __init h3_mmc_init(void); | 39 | extern void h3_mmc_init(void); |
40 | extern void h3_mmc_slot_cover_handler(void *arg, int state); | 40 | extern void h3_mmc_slot_cover_handler(void *arg, int state); |
41 | 41 | ||
42 | #endif /* __ASM_ARCH_OMAP_H3_H */ | 42 | #endif /* __ASM_ARCH_OMAP_H3_H */ |