ARM: OMAP1: Use I2C bus registration helper for omap1

This patch starts using introduced I2C bus registration helper by cleaning
up registration currently done in various places and by doing necessary
board file modifications.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 2 insertions, 5 deletions

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)