diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3logic.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3logic.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c index b726943d7c93..60d9be49dbab 100644 --- a/arch/arm/mach-omap2/board-omap3logic.c +++ b/arch/arm/mach-omap2/board-omap3logic.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include "hsmmc.h" | 37 | #include "hsmmc.h" |
38 | #include "timer-gp.h" | 38 | #include "timer-gp.h" |
39 | #include "control.h" | 39 | #include "control.h" |
40 | #include "common-board-devices.h" | ||
40 | 41 | ||
41 | #include <plat/mux.h> | 42 | #include <plat/mux.h> |
42 | #include <plat/board.h> | 43 | #include <plat/board.h> |
@@ -93,19 +94,9 @@ static struct twl4030_platform_data omap3logic_twldata = { | |||
93 | .vmmc1 = &omap3logic_vmmc1, | 94 | .vmmc1 = &omap3logic_vmmc1, |
94 | }; | 95 | }; |
95 | 96 | ||
96 | static struct i2c_board_info __initdata omap3logic_i2c_boardinfo[] = { | ||
97 | { | ||
98 | I2C_BOARD_INFO("twl4030", 0x48), | ||
99 | .flags = I2C_CLIENT_WAKE, | ||
100 | .irq = INT_34XX_SYS_NIRQ, | ||
101 | .platform_data = &omap3logic_twldata, | ||
102 | }, | ||
103 | }; | ||
104 | |||
105 | static int __init omap3logic_i2c_init(void) | 97 | static int __init omap3logic_i2c_init(void) |
106 | { | 98 | { |
107 | omap_register_i2c_bus(1, 2600, omap3logic_i2c_boardinfo, | 99 | omap3_pmic_init("twl4030", &omap3logic_twldata); |
108 | ARRAY_SIZE(omap3logic_i2c_boardinfo)); | ||
109 | return 0; | 100 | return 0; |
110 | } | 101 | } |
111 | 102 | ||
@@ -147,7 +138,6 @@ static struct omap_smsc911x_platform_data __initdata board_smsc911x_data = { | |||
147 | .cs = OMAP3LOGIC_SMSC911X_CS, | 138 | .cs = OMAP3LOGIC_SMSC911X_CS, |
148 | .gpio_irq = -EINVAL, | 139 | .gpio_irq = -EINVAL, |
149 | .gpio_reset = -EINVAL, | 140 | .gpio_reset = -EINVAL, |
150 | .flags = IORESOURCE_IRQ_LOWLEVEL, | ||
151 | }; | 141 | }; |
152 | 142 | ||
153 | /* TODO/FIXME (comment by Peter Barada, LogicPD): | 143 | /* TODO/FIXME (comment by Peter Barada, LogicPD): |