diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3pandora.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3pandora.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 517701aae3ca..b99cc642c5e2 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c | |||
@@ -544,15 +544,6 @@ static struct twl4030_platform_data omap3pandora_twldata = { | |||
544 | .bci = &pandora_bci_data, | 544 | .bci = &pandora_bci_data, |
545 | }; | 545 | }; |
546 | 546 | ||
547 | static struct i2c_board_info __initdata omap3pandora_i2c_boardinfo[] = { | ||
548 | { | ||
549 | I2C_BOARD_INFO("tps65950", 0x48), | ||
550 | .flags = I2C_CLIENT_WAKE, | ||
551 | .irq = INT_34XX_SYS_NIRQ, | ||
552 | .platform_data = &omap3pandora_twldata, | ||
553 | }, | ||
554 | }; | ||
555 | |||
556 | static struct i2c_board_info __initdata omap3pandora_i2c3_boardinfo[] = { | 547 | static struct i2c_board_info __initdata omap3pandora_i2c3_boardinfo[] = { |
557 | { | 548 | { |
558 | I2C_BOARD_INFO("bq27500", 0x55), | 549 | I2C_BOARD_INFO("bq27500", 0x55), |
@@ -562,8 +553,7 @@ static struct i2c_board_info __initdata omap3pandora_i2c3_boardinfo[] = { | |||
562 | 553 | ||
563 | static int __init omap3pandora_i2c_init(void) | 554 | static int __init omap3pandora_i2c_init(void) |
564 | { | 555 | { |
565 | omap_register_i2c_bus(1, 2600, omap3pandora_i2c_boardinfo, | 556 | omap3_pmic_init("tps65950", &omap3pandora_twldata); |
566 | ARRAY_SIZE(omap3pandora_i2c_boardinfo)); | ||
567 | /* i2c2 pins are not connected */ | 557 | /* i2c2 pins are not connected */ |
568 | omap_register_i2c_bus(3, 100, omap3pandora_i2c3_boardinfo, | 558 | omap_register_i2c_bus(3, 100, omap3pandora_i2c3_boardinfo, |
569 | ARRAY_SIZE(omap3pandora_i2c3_boardinfo)); | 559 | ARRAY_SIZE(omap3pandora_i2c3_boardinfo)); |