From: Jarkko Nikula <jarkko.nikula@xxxxxxxxx> 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@xxxxxxxxx> Acked-by: Carlos Eduardo Aguiar <carlos.aguiar@xxxxxxxxxxx> --- arch/arm/mach-omap1/board-h2.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index 43f9627..9b3a1d1 100644 --- 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)); -- 1.5.3.GIT - To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html