From: Carlos Eduardo Aguiar Date: Mon, 7 Jan 2008 20:27:58 +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~65 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f86e5823874384d322ddc7ed802ae36cc9086cc7;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 H3 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-h3.c file. Signed-off-by: Carlos Eduardo Aguiar Signed-off-by: Jarkko Nikula Acked-by: Eduardo Valentin Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index b86df0aa344..b01e6d42fd7 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c @@ -695,16 +695,14 @@ static void __init h3_init(void) /* GPIO10 pullup/down register, Enable pullup on GPIO10 */ omap_cfg_reg(V2_1710_GPIO10); - i2c_register_board_info(1, h3_i2c_board_info, - ARRAY_SIZE(h3_i2c_board_info)); - platform_add_devices(devices, ARRAY_SIZE(devices)); spi_register_board_info(h3_spi_board_info, ARRAY_SIZE(h3_spi_board_info)); omap_board_config = h3_config; omap_board_config_size = ARRAY_SIZE(h3_config); omap_serial_init(); - omap_register_i2c_bus(1, 100, NULL, 0); + omap_register_i2c_bus(1, 100, h3_i2c_board_info, + ARRAY_SIZE(h3_i2c_board_info)); h3_mmc_init(); omap_register_gpio_switches(h3_gpio_switches, ARRAY_SIZE(h3_gpio_switches));