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: Jarkko Nikula <jarkko.nikula@nokia.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

authored by Jarkko Nikula and committed by Tony Lindgren 1ed16a86 feb72f3b

+17 -12
+1
arch/arm/mach-omap1/board-ams-delta.c
··· 227 omap_board_config = ams_delta_config; 228 omap_board_config_size = ARRAY_SIZE(ams_delta_config); 229 omap_serial_init(); 230 231 /* Clear latch2 (NAND, LCD, modem enable) */ 232 ams_delta_latch2_write(~0, 0);
··· 227 omap_board_config = ams_delta_config; 228 omap_board_config_size = ARRAY_SIZE(ams_delta_config); 229 omap_serial_init(); 230 + omap_register_i2c_bus(1, 100, NULL, 0); 231 232 /* Clear latch2 (NAND, LCD, modem enable) */ 233 ams_delta_latch2_write(~0, 0);
+1
arch/arm/mach-omap1/board-fsample.c
··· 234 omap_board_config = fsample_config; 235 omap_board_config_size = ARRAY_SIZE(fsample_config); 236 omap_serial_init(); 237 } 238 239 static void __init fsample_init_smc91x(void)
··· 234 omap_board_config = fsample_config; 235 omap_board_config_size = ARRAY_SIZE(fsample_config); 236 omap_serial_init(); 237 + omap_register_i2c_bus(1, 100, NULL, 0); 238 } 239 240 static void __init fsample_init_smc91x(void)
+1
arch/arm/mach-omap1/board-generic.c
··· 101 omap_board_config = generic_config; 102 omap_board_config_size = ARRAY_SIZE(generic_config); 103 omap_serial_init(); 104 } 105 106 static void __init omap_generic_map_io(void)
··· 101 omap_board_config = generic_config; 102 omap_board_config_size = ARRAY_SIZE(generic_config); 103 omap_serial_init(); 104 + omap_register_i2c_bus(1, 100, NULL, 0); 105 } 106 107 static void __init omap_generic_map_io(void)
+2 -5
arch/arm/mach-omap1/board-h2.c
··· 458 omap_board_config = h2_config; 459 omap_board_config_size = ARRAY_SIZE(h2_config); 460 omap_serial_init(); 461 h2_mmc_init(); 462 463 /* irq for tps65010 chip */ 464 omap_cfg_reg(W4_GPIO58); 465 if (gpio_request(58, "tps65010") == 0) 466 gpio_direction_input(58); 467 - 468 - #ifdef CONFIG_I2C_BOARDINFO 469 - i2c_register_board_info(1, h2_i2c_board_info, 470 - ARRAY_SIZE(h2_i2c_board_info)); 471 - #endif 472 } 473 474 static void __init h2_map_io(void)
··· 458 omap_board_config = h2_config; 459 omap_board_config_size = ARRAY_SIZE(h2_config); 460 omap_serial_init(); 461 + omap_register_i2c_bus(1, 100, h2_i2c_board_info, 462 + ARRAY_SIZE(h2_i2c_board_info)); 463 h2_mmc_init(); 464 465 /* irq for tps65010 chip */ 466 omap_cfg_reg(W4_GPIO58); 467 if (gpio_request(58, "tps65010") == 0) 468 gpio_direction_input(58); 469 } 470 471 static void __init h2_map_io(void)
+2 -4
arch/arm/mach-omap1/board-h3.c
··· 517 omap_board_config = h3_config; 518 omap_board_config_size = ARRAY_SIZE(h3_config); 519 omap_serial_init(); 520 h3_mmc_init(); 521 - 522 - /* FIXME setup irq for tps65013 chip */ 523 - i2c_register_board_info(1, h3_i2c_board_info, 524 - ARRAY_SIZE(h3_i2c_board_info)); 525 } 526 527 static void __init h3_init_smc91x(void)
··· 517 omap_board_config = h3_config; 518 omap_board_config_size = ARRAY_SIZE(h3_config); 519 omap_serial_init(); 520 + omap_register_i2c_bus(1, 100, h3_i2c_board_info, 521 + ARRAY_SIZE(h3_i2c_board_info)); 522 h3_mmc_init(); 523 } 524 525 static void __init h3_init_smc91x(void)
+1
arch/arm/mach-omap1/board-innovator.c
··· 411 omap_board_config = innovator_config; 412 omap_board_config_size = ARRAY_SIZE(innovator_config); 413 omap_serial_init(); 414 } 415 416 static void __init innovator_map_io(void)
··· 411 omap_board_config = innovator_config; 412 omap_board_config_size = ARRAY_SIZE(innovator_config); 413 omap_serial_init(); 414 + omap_register_i2c_bus(1, 100, NULL, 0); 415 } 416 417 static void __init innovator_map_io(void)
+1
arch/arm/mach-omap1/board-nokia770.c
··· 330 omap_board_config_size = ARRAY_SIZE(nokia770_config); 331 omap_gpio_init(); 332 omap_serial_init(); 333 omap_dsp_init(); 334 ads7846_dev_init(); 335 mipid_dev_init();
··· 330 omap_board_config_size = ARRAY_SIZE(nokia770_config); 331 omap_gpio_init(); 332 omap_serial_init(); 333 + omap_register_i2c_bus(1, 100, NULL, 0); 334 omap_dsp_init(); 335 ads7846_dev_init(); 336 mipid_dev_init();
+2 -3
arch/arm/mach-omap1/board-osk.c
··· 473 if (gpio_request(OMAP_MPUIO(1), "tps65010") == 0) 474 gpio_direction_input(OMAP_MPUIO(1)); 475 476 - i2c_register_board_info(1, osk_i2c_board_info, 477 - ARRAY_SIZE(osk_i2c_board_info)); 478 - 479 omap_serial_init(); 480 osk_mistral_init(); 481 } 482
··· 473 if (gpio_request(OMAP_MPUIO(1), "tps65010") == 0) 474 gpio_direction_input(OMAP_MPUIO(1)); 475 476 omap_serial_init(); 477 + omap_register_i2c_bus(1, 400, osk_i2c_board_info, 478 + ARRAY_SIZE(osk_i2c_board_info)); 479 osk_mistral_init(); 480 } 481
+1
arch/arm/mach-omap1/board-palmte.c
··· 419 spi_register_board_info(palmte_spi_info, ARRAY_SIZE(palmte_spi_info)); 420 421 omap_serial_init(); 422 palmte_gpio_setup(); 423 } 424
··· 419 spi_register_board_info(palmte_spi_info, ARRAY_SIZE(palmte_spi_info)); 420 421 omap_serial_init(); 422 + omap_register_i2c_bus(1, 100, NULL, 0); 423 palmte_gpio_setup(); 424 } 425
+1
arch/arm/mach-omap1/board-palmtt.c
··· 338 339 spi_register_board_info(palmtt_boardinfo,ARRAY_SIZE(palmtt_boardinfo)); 340 omap_serial_init(); 341 } 342 343 static void __init omap_palmtt_map_io(void)
··· 338 339 spi_register_board_info(palmtt_boardinfo,ARRAY_SIZE(palmtt_boardinfo)); 340 omap_serial_init(); 341 + omap_register_i2c_bus(1, 100, NULL, 0); 342 } 343 344 static void __init omap_palmtt_map_io(void)
+1
arch/arm/mach-omap1/board-palmz71.c
··· 363 spi_register_board_info(palmz71_boardinfo, 364 ARRAY_SIZE(palmz71_boardinfo)); 365 omap_serial_init(); 366 palmz71_gpio_setup(0); 367 } 368
··· 363 spi_register_board_info(palmz71_boardinfo, 364 ARRAY_SIZE(palmz71_boardinfo)); 365 omap_serial_init(); 366 + omap_register_i2c_bus(1, 100, NULL, 0); 367 palmz71_gpio_setup(0); 368 } 369
+1
arch/arm/mach-omap1/board-perseus2.c
··· 234 omap_board_config = perseus2_config; 235 omap_board_config_size = ARRAY_SIZE(perseus2_config); 236 omap_serial_init(); 237 } 238 239 static void __init perseus2_init_smc91x(void)
··· 234 omap_board_config = perseus2_config; 235 omap_board_config_size = ARRAY_SIZE(perseus2_config); 236 omap_serial_init(); 237 + omap_register_i2c_bus(1, 100, NULL, 0); 238 } 239 240 static void __init perseus2_init_smc91x(void)
+1
arch/arm/mach-omap1/board-sx1.c
··· 442 omap_board_config = sx1_config; 443 omap_board_config_size = ARRAY_SIZE(sx1_config); 444 omap_serial_init(); 445 sx1_mmc_init(); 446 447 /* turn on USB power */
··· 442 omap_board_config = sx1_config; 443 omap_board_config_size = ARRAY_SIZE(sx1_config); 444 omap_serial_init(); 445 + omap_register_i2c_bus(1, 100, NULL, 0); 446 sx1_mmc_init(); 447 448 /* turn on USB power */
+1
arch/arm/mach-omap1/board-voiceblue.c
··· 198 omap_board_config = voiceblue_config; 199 omap_board_config_size = ARRAY_SIZE(voiceblue_config); 200 omap_serial_init(); 201 202 /* There is a good chance board is going up, so enable power LED 203 * (it is connected through invertor) */
··· 198 omap_board_config = voiceblue_config; 199 omap_board_config_size = ARRAY_SIZE(voiceblue_config); 200 omap_serial_init(); 201 + omap_register_i2c_bus(1, 100, NULL, 0); 202 203 /* There is a good chance board is going up, so enable power LED 204 * (it is connected through invertor) */