diff options
Diffstat (limited to 'arch/arm/mach-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/board-h2.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/board-h3.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/board-osk.c | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index 507987720015..4b444fdaafea 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c | |||
| @@ -351,11 +351,9 @@ static void __init h2_init_smc91x(void) | |||
| 351 | static struct i2c_board_info __initdata h2_i2c_board_info[] = { | 351 | static struct i2c_board_info __initdata h2_i2c_board_info[] = { |
| 352 | { | 352 | { |
| 353 | I2C_BOARD_INFO("tps65010", 0x48), | 353 | I2C_BOARD_INFO("tps65010", 0x48), |
| 354 | .type = "tps65010", | ||
| 355 | .irq = OMAP_GPIO_IRQ(58), | 354 | .irq = OMAP_GPIO_IRQ(58), |
| 356 | }, { | 355 | }, { |
| 357 | I2C_BOARD_INFO("isp1301_omap", 0x2d), | 356 | I2C_BOARD_INFO("isp1301_omap", 0x2d), |
| 358 | .type = "isp1301_omap", | ||
| 359 | .irq = OMAP_GPIO_IRQ(2), | 357 | .irq = OMAP_GPIO_IRQ(2), |
| 360 | }, | 358 | }, |
| 361 | }; | 359 | }; |
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index c3ef1ee5f77b..7fbaa8d648cd 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c | |||
| @@ -473,8 +473,7 @@ static struct omap_board_config_kernel h3_config[] __initdata = { | |||
| 473 | 473 | ||
| 474 | static struct i2c_board_info __initdata h3_i2c_board_info[] = { | 474 | static struct i2c_board_info __initdata h3_i2c_board_info[] = { |
| 475 | { | 475 | { |
| 476 | I2C_BOARD_INFO("tps65010", 0x48), | 476 | I2C_BOARD_INFO("tps65013", 0x48), |
| 477 | .type = "tps65013", | ||
| 478 | /* .irq = OMAP_GPIO_IRQ(??), */ | 477 | /* .irq = OMAP_GPIO_IRQ(??), */ |
| 479 | }, | 478 | }, |
| 480 | }; | 479 | }; |
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index 4f9baba7d893..a66505f58b15 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c | |||
| @@ -254,7 +254,6 @@ static struct tps65010_board tps_board = { | |||
| 254 | static struct i2c_board_info __initdata osk_i2c_board_info[] = { | 254 | static struct i2c_board_info __initdata osk_i2c_board_info[] = { |
| 255 | { | 255 | { |
| 256 | I2C_BOARD_INFO("tps65010", 0x48), | 256 | I2C_BOARD_INFO("tps65010", 0x48), |
| 257 | .type = "tps65010", | ||
| 258 | .irq = OMAP_GPIO_IRQ(OMAP_MPUIO(1)), | 257 | .irq = OMAP_GPIO_IRQ(OMAP_MPUIO(1)), |
| 259 | .platform_data = &tps_board, | 258 | .platform_data = &tps_board, |
| 260 | 259 | ||
