ARM: OMAP: Passing h2_i2c_board_info via omap_register_i2c_bus instead of i2c_registe...

This patch passes h2_i2c_board_info via omap_register_i2c_bus instead of
i2c_register_board_info on arch/arm/mach-omap1/board-h2.c file.
This modification also fix kernel panic on I2C when booting such boards.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Acked-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 43f96272b067736b0195689696f05040f75d4050..9b3a1d180b2743f2772e0c6912927a6309af78f8 100644 (file)
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -447,8 +447,6 @@ static void __init h2_init_irq(void)
        omap1_init_common_hw();
        omap_init_irq();
        omap_gpio_init();
-       i2c_register_board_info(1, h2_i2c_board_info,
-                               ARRAY_SIZE(h2_i2c_board_info));
        h2_init_smc91x();
 }
 
@@ -551,7 +549,8 @@ 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, NULL, 0);
+       omap_register_i2c_bus(1, 100, h2_i2c_board_info,
+                             ARRAY_SIZE(h2_i2c_board_info));
        h2_mmc_init();
        omap_register_gpio_switches(h2_gpio_switches,
                                    ARRAY_SIZE(h2_gpio_switches));