Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes

[pandora-kernel.git] / arch / arm / mach-omap2 / i2c.c

diff --git a/arch/arm/mach-omap2/i2c.c b/arch/arm/mach-omap2/i2c.c
index 7951ae1..79c478c 100644 (file)
--- a/arch/arm/mach-omap2/i2c.c
+++ b/arch/arm/mach-omap2/i2c.c
@@ -21,32 +21,19 @@
 
 #include <plat/cpu.h>
 #include <plat/i2c.h>
-#include <plat/mux.h>
 
 #include "mux.h"
 
 void __init omap2_i2c_mux_pins(int bus_id)
 {
-       if (cpu_is_omap24xx()) {
-               const int omap24xx_pins[][2] = {
-                       { M19_24XX_I2C1_SCL, L15_24XX_I2C1_SDA },
-                       { J15_24XX_I2C2_SCL, H19_24XX_I2C2_SDA },
-               };
-               int scl, sda;
-
-               scl = omap24xx_pins[bus_id - 1][0];
-               sda = omap24xx_pins[bus_id - 1][1];
-               omap_cfg_reg(sda);
-               omap_cfg_reg(scl);
-       }
+       char mux_name[sizeof("i2c2_scl.i2c2_scl")];
 
        /* First I2C bus is not muxable */
-       if (cpu_is_omap34xx() && bus_id > 1) {
-               char mux_name[sizeof("i2c2_scl.i2c2_scl")];
+       if (bus_id == 1)
+               return;
 
-               sprintf(mux_name, "i2c%i_scl.i2c%i_scl", bus_id, bus_id);
-               omap_mux_init_signal(mux_name, OMAP_PIN_INPUT);
-               sprintf(mux_name, "i2c%i_sda.i2c%i_sda", bus_id, bus_id);
-               omap_mux_init_signal(mux_name, OMAP_PIN_INPUT);
-       }
+       sprintf(mux_name, "i2c%i_scl.i2c%i_scl", bus_id, bus_id);
+       omap_mux_init_signal(mux_name, OMAP_PIN_INPUT);
+       sprintf(mux_name, "i2c%i_sda.i2c%i_sda", bus_id, bus_id);
+       omap_mux_init_signal(mux_name, OMAP_PIN_INPUT);
 }