Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ed16a86 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Tony Lindgren
Browse files

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: default avatarJarkko Nikula <jarkko.nikula@nokia.com>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent feb72f3b

arch/arm/mach-omap1/board-ams-delta.c

+1 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ static void __init ams_delta_init(void) 
	omap_board_config = ams_delta_config;

	omap_board_config_size = ARRAY_SIZE(ams_delta_config);

	omap_serial_init();

	omap_register_i2c_bus(1, 100, NULL, 0);



	/* Clear latch2 (NAND, LCD, modem enable) */

	ams_delta_latch2_write(~0, 0);

arch/arm/mach-omap1/board-fsample.c

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ static void __init omap_fsample_init(void) 
	omap_board_config = fsample_config;

	omap_board_config_size = ARRAY_SIZE(fsample_config);

	omap_serial_init();

	omap_register_i2c_bus(1, 100, NULL, 0);

}



static void __init fsample_init_smc91x(void)

arch/arm/mach-omap1/board-generic.c

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ static void __init omap_generic_init(void) 
	omap_board_config = generic_config;

	omap_board_config_size = ARRAY_SIZE(generic_config);

	omap_serial_init();

	omap_register_i2c_bus(1, 100, NULL, 0);

}



static void __init omap_generic_map_io(void)

arch/arm/mach-omap1/board-h2.c

+2 −5
Original line number Diff line number Diff line
@@ -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)

arch/arm/mach-omap1/board-h3.c

+2 −4
Original line number Diff line number Diff line
@@ -517,11 +517,9 @@ static void __init h3_init(void) 
	omap_board_config = h3_config;

	omap_board_config_size = ARRAY_SIZE(h3_config);

	omap_serial_init();

	h3_mmc_init();



	/* FIXME setup irq for tps65013 chip */

	i2c_register_board_info(1, h3_i2c_board_info,

	omap_register_i2c_bus(1, 100, h3_i2c_board_info,

			      ARRAY_SIZE(h3_i2c_board_info));

	h3_mmc_init();

}



static void __init h3_init_smc91x(void)