From: Jarkko Nikula Date: Mon, 7 Jan 2008 20:27:53 +0000 (-0400) Subject: ARM: OMAP: Passing h2_i2c_board_info via omap_register_i2c_bus instead of i2c_registe... X-Git-Tag: v2.6.24-omap1~66 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9c7dfe1ff3c1b71d02cfbe385f9a2a8d22a4e8c4;p=linux-2.6-omap-h63xx.git ARM: OMAP: Passing h2_i2c_board_info via omap_register_i2c_bus instead of i2c_register_board_info on H2 board file. 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 Acked-by: Carlos Eduardo Aguiar Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index 43f96272b06..9b3a1d180b2 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));