diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3touchbook.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3touchbook.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index 15f9d7ddc230..0a9b3299427a 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c | |||
@@ -274,15 +274,6 @@ static struct twl4030_platform_data touchbook_twldata = { | |||
274 | .vpll2 = &touchbook_vpll2, | 274 | .vpll2 = &touchbook_vpll2, |
275 | }; | 275 | }; |
276 | 276 | ||
277 | static struct i2c_board_info __initdata touchbook_i2c_boardinfo[] = { | ||
278 | { | ||
279 | I2C_BOARD_INFO("twl4030", 0x48), | ||
280 | .flags = I2C_CLIENT_WAKE, | ||
281 | .irq = INT_34XX_SYS_NIRQ, | ||
282 | .platform_data = &touchbook_twldata, | ||
283 | }, | ||
284 | }; | ||
285 | |||
286 | static struct i2c_board_info __initdata touchBook_i2c_boardinfo[] = { | 277 | static struct i2c_board_info __initdata touchBook_i2c_boardinfo[] = { |
287 | { | 278 | { |
288 | I2C_BOARD_INFO("bq27200", 0x55), | 279 | I2C_BOARD_INFO("bq27200", 0x55), |
@@ -292,8 +283,7 @@ static struct i2c_board_info __initdata touchBook_i2c_boardinfo[] = { | |||
292 | static int __init omap3_touchbook_i2c_init(void) | 283 | static int __init omap3_touchbook_i2c_init(void) |
293 | { | 284 | { |
294 | /* Standard TouchBook bus */ | 285 | /* Standard TouchBook bus */ |
295 | omap_register_i2c_bus(1, 2600, touchbook_i2c_boardinfo, | 286 | omap3_pmic_init("twl4030", &touchbook_twldata); |
296 | ARRAY_SIZE(touchbook_i2c_boardinfo)); | ||
297 | 287 | ||
298 | /* Additional TouchBook bus */ | 288 | /* Additional TouchBook bus */ |
299 | omap_register_i2c_bus(3, 100, touchBook_i2c_boardinfo, | 289 | omap_register_i2c_bus(3, 100, touchBook_i2c_boardinfo, |