14 files changed, 17 insertions, 12 deletions

diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index 6aac72dc4306..8b102ad59c14 100644
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -227,6 +227,7 @@ static void __init ams_delta_init(void)
         omap_board_config = ams_delta_config;
         omap_board_config_size = ARRAY_SIZE(ams_delta_config);
         omap_serial_init();
+        omap_register_i2c_bus(1, 100, NULL, 0);
 
         /* Clear latch2 (NAND, LCD, modem enable) */
         ams_delta_latch2_write(~0, 0);
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index 4f4640ba2a97..1bdb66638e29 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -234,6 +234,7 @@ static void __init omap_fsample_init(void)
         omap_board_config = fsample_config;
         omap_board_config_size = ARRAY_SIZE(fsample_config);
         omap_serial_init();
+        omap_register_i2c_bus(1, 100, NULL, 0);
 }
 
 static void __init fsample_init_smc91x(void)
diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c
index 33d01adab1ed..005bf0e3e1e3 100644
--- a/arch/arm/mach-omap1/board-generic.c
+++ b/arch/arm/mach-omap1/board-generic.c
@@ -101,6 +101,7 @@ static void __init omap_generic_init(void)
         omap_board_config = generic_config;
         omap_board_config_size = ARRAY_SIZE(generic_config);
         omap_serial_init();
+        omap_register_i2c_bus(1, 100, NULL, 0);
 }
 
 static void __init omap_generic_map_io(void)
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index ab6e68b00064..00b7623b9b0c 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -458,17 +458,14 @@ static void __init h2_init(void)
         omap_board_config = h2_config;
         omap_board_config_size = ARRAY_SIZE(h2_config);
         omap_serial_init();
+        omap_register_i2c_bus(1, 100, h2_i2c_board_info,
+                              ARRAY_SIZE(h2_i2c_board_info));
         h2_mmc_init();
 
         /* irq for tps65010 chip */
         omap_cfg_reg(W4_GPIO58);
         if (gpio_request(58, "tps65010") == 0)
                 gpio_direction_input(58);
-
-#ifdef CONFIG_I2C_BOARDINFO
-        i2c_register_board_info(1, h2_i2c_board_info,
-                        ARRAY_SIZE(h2_i2c_board_info));
-#endif
 }
 
 static void __init h2_map_io(void)
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index f28f05d6760d..7cf6ccd4e7ff 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -517,11 +517,9 @@ static void __init h3_init(void)
         omap_board_config = h3_config;
         omap_board_config_size = ARRAY_SIZE(h3_config);
         omap_serial_init();
+        omap_register_i2c_bus(1, 100, h3_i2c_board_info,
+                              ARRAY_SIZE(h3_i2c_board_info));
         h3_mmc_init();
-
-        /* FIXME setup irq for tps65013 chip */
-        i2c_register_board_info(1, h3_i2c_board_info,
-                        ARRAY_SIZE(h3_i2c_board_info));
 }
 
 static void __init h3_init_smc91x(void)
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c
index 92c14d364b51..4b8ae3ee0d05 100644
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@ -411,6 +411,7 @@ static void __init innovator_init(void)
         omap_board_config = innovator_config;
         omap_board_config_size = ARRAY_SIZE(innovator_config);
         omap_serial_init();
+        omap_register_i2c_bus(1, 100, NULL, 0);
 }
 
 static void __init innovator_map_io(void)
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index e2c8ffd75cff..9e8cdd4bd7dc 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -330,6 +330,7 @@ static void __init omap_nokia770_init(void)
         omap_board_config_size = ARRAY_SIZE(nokia770_config);
         omap_gpio_init();
         omap_serial_init();
+        omap_register_i2c_bus(1, 100, NULL, 0);
         omap_dsp_init();
         ads7846_dev_init();
         mipid_dev_init();
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index e1f813d4417d..effa176be57b 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -473,10 +473,9 @@ static void __init osk_init(void)
         if (gpio_request(OMAP_MPUIO(1), "tps65010") == 0)
                 gpio_direction_input(OMAP_MPUIO(1));
 
-        i2c_register_board_info(1, osk_i2c_board_info,
-                        ARRAY_SIZE(osk_i2c_board_info));
-
         omap_serial_init();
+        omap_register_i2c_bus(1, 400, osk_i2c_board_info,
+                              ARRAY_SIZE(osk_i2c_board_info));
         osk_mistral_init();
 }
 
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
index 2f9d00a00135..f392f5a014ea 100644
--- a/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
@@ -419,6 +419,7 @@ static void __init omap_palmte_init(void)
         spi_register_board_info(palmte_spi_info, ARRAY_SIZE(palmte_spi_info));
 
         omap_serial_init();
+        omap_register_i2c_bus(1, 100, NULL, 0);
         palmte_gpio_setup();
 }
 
diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c
index 772daed493c1..e9a1ef52f887 100644
--- a/arch/arm/mach-omap1/board-palmtt.c
+++ b/arch/arm/mach-omap1/board-palmtt.c
@@ -338,6 +338,7 @@ static void __init omap_palmtt_init(void)
 
         spi_register_board_info(palmtt_boardinfo,ARRAY_SIZE(palmtt_boardinfo));
         omap_serial_init();
+        omap_register_i2c_bus(1, 100, NULL, 0);
 }
 
 static void __init omap_palmtt_map_io(void)
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index a9a0f6610c3d..2e1dbfc28efe 100644
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -363,6 +363,7 @@ omap_palmz71_init(void)
         spi_register_board_info(palmz71_boardinfo,
                                 ARRAY_SIZE(palmz71_boardinfo));
         omap_serial_init();
+        omap_register_i2c_bus(1, 100, NULL, 0);
         palmz71_gpio_setup(0);
 }
 
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index e79749df434b..cafe91f06ab8 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -234,6 +234,7 @@ static void __init omap_perseus2_init(void)
         omap_board_config = perseus2_config;
         omap_board_config_size = ARRAY_SIZE(perseus2_config);
         omap_serial_init();
+        omap_register_i2c_bus(1, 100, NULL, 0);
 }
 
 static void __init perseus2_init_smc91x(void)
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index be3ecd8c890e..faa99b54c1ec 100644
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -442,6 +442,7 @@ static void __init omap_sx1_init(void)
         omap_board_config = sx1_config;
         omap_board_config_size = ARRAY_SIZE(sx1_config);
         omap_serial_init();
+        omap_register_i2c_bus(1, 100, NULL, 0);
         sx1_mmc_init();
 
         /* turn on USB power */
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index c82a1cd20ad4..02cac41aa5a7 100644
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -198,6 +198,7 @@ static void __init voiceblue_init(void)
         omap_board_config = voiceblue_config;
         omap_board_config_size = ARRAY_SIZE(voiceblue_config);
         omap_serial_init();
+        omap_register_i2c_bus(1, 100, NULL, 0);
 
         /* There is a good chance board is going up, so enable power LED
          * (it is connected through invertor) */