ARM: OMAP: I2C-1 init fix for 2430

I2C-1 for 2430 was commented previously, enabled in this patch.

Signed-off-by: Syed Mohammed Khasim <x0khasim@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index 2fac7d3f2af3825579f423306d8145d468dcc809..3e84a03a0dc4d4b4e5cabd4fbbd115c0025aff21 100644 (file)
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -136,8 +136,10 @@ static void omap_init_i2c(void)
         * it can include clocking and address info, maybe more.
         */
        if (cpu_is_omap24xx()) {
-               omap_cfg_reg(M19_24XX_I2C1_SCL);
-               omap_cfg_reg(L15_24XX_I2C1_SDA);
+               if (machine_is_omap_h4()) {
+                       omap_cfg_reg(M19_24XX_I2C1_SCL);
+                       omap_cfg_reg(L15_24XX_I2C1_SDA);
+               }
        } else {
                omap_cfg_reg(I2C_SCL);
                omap_cfg_reg(I2C_SDA);
@@ -501,13 +503,13 @@ static int __init omap_init_devices(void)
         * in alphabetical order so they're easier to sort through.
         */
        omap_init_dsp();
-       omap_init_i2c();
        omap_init_kp();
        omap_init_mmc();
        omap_init_uwire();
        omap_init_wdt();
        omap_init_rng();
 #endif
+       omap_init_i2c();
        return 0;
 }
 arch_initcall(omap_init_devices);