2 files changed, 12 insertions, 56 deletions

diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index 6b3984964cc5..3c6530475710 100644
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -24,6 +24,8 @@
 #include <plat/common.h>
 #include <plat/usb.h>
 
+#include <mach/board-zoom.h>
+
 #include "mux.h"
 #include "hsmmc.h"
 
@@ -188,6 +190,11 @@ static int zoom_twl_gpio_setup(struct device *dev,
         return 0;
 }
 
+/* EXTMUTE callback function */
+void zoom2_set_hs_extmute(int mute)
+{
+        gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute);
+}
 
 static int zoom_batt_table[] = {
 /* 0 C*/
@@ -257,6 +264,11 @@ static struct i2c_board_info __initdata zoom_i2c_boardinfo[] = {
 
 static int __init omap_i2c_init(void)
 {
+        if (machine_is_omap_zoom2()) {
+                zoom_audio_data.ramp_delay_value = 3;   /* 161 ms */
+                zoom_audio_data.hs_extmute = 1;
+                zoom_audio_data.set_hs_extmute = zoom2_set_hs_extmute;
+        }
         omap_register_i2c_bus(1, 2400, zoom_i2c_boardinfo,
                         ARRAY_SIZE(zoom_i2c_boardinfo));
         omap_register_i2c_bus(2, 400, NULL, 0);
diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c
index efbcd8fb21ec..00c8f835649f 100644
--- a/arch/arm/mach-omap2/board-zoom2.c
+++ b/arch/arm/mach-omap2/board-zoom2.c
@@ -35,61 +35,6 @@ static void __init omap_zoom2_init_irq(void)
         omap_gpio_init();
 }
 
-/* EXTMUTE callback function */
-void zoom2_set_hs_extmute(int mute)
-{
-        gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute);
-}
-
-static struct twl4030_madc_platform_data zoom2_madc_data = {
-        .irq_line       = 1,
-};
-
-static struct twl4030_codec_audio_data zoom2_audio_data = {
-        .audio_mclk = 26000000,
-        .ramp_delay_value = 3,  /* 161 ms */
-        .hs_extmute = 1,
-        .set_hs_extmute = zoom2_set_hs_extmute,
-};
-
-static struct twl4030_codec_data zoom2_codec_data = {
-        .audio_mclk = 26000000,
-        .audio = &zoom2_audio_data,
-};
-
-static struct twl4030_platform_data zoom2_twldata = {
-        .irq_base       = TWL4030_IRQ_BASE,
-        .irq_end        = TWL4030_IRQ_END,
-
-        /* platform_data for children goes here */
-        .bci            = &zoom2_bci_data,
-        .madc           = &zoom2_madc_data,
-        .usb            = &zoom2_usb_data,
-        .gpio           = &zoom2_gpio_data,
-        .keypad         = &zoom2_kp_twl4030_data,
-        .codec          = &zoom2_codec_data,
-        .vmmc1          = &zoom2_vmmc1,
-        .vmmc2          = &zoom2_vmmc2,
-        .vsim           = &zoom2_vsim,
-};
-
-static struct i2c_board_info __initdata zoom2_i2c_boardinfo[] = {
-        {
-                I2C_BOARD_INFO("twl4030", 0x48),
-                .flags = I2C_CLIENT_WAKE,
-                .irq = INT_34XX_SYS_NIRQ,
-                .platform_data = &zoom2_twldata,
-        },
-};
-
-static int __init omap3_zoom2_i2c_init(void)
-{
-        omap_register_i2c_bus(1, 2600, zoom2_i2c_boardinfo,
-                        ARRAY_SIZE(zoom2_i2c_boardinfo));
-        return 0;
-}
-
-
 #ifdef CONFIG_OMAP_MUX
 static struct omap_board_mux board_mux[] __initdata = {
         /* WLAN IRQ - GPIO 162 */
@@ -156,7 +101,6 @@ static void __init omap_zoom2_init(void)
 {
         omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
         zoom_peripherals_init();
-        omap3_zoom2_i2c_init();
         board_nand_init(zoom_nand_partitions,
                         ARRAY_SIZE(zoom_nand_partitions), ZOOM_NAND_CS);
         zoom_debugboard_init();