diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-26 14:58:52 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2012-01-05 10:11:59 +0000 |
| commit | 95e7274d0c2543dda6ed84cc52b78fa0ec0059c3 (patch) | |
| tree | 4bdc50a393f1b025d3624c9eaba96b4892d59bf0 /arch/arm/mach-ux500/board-mop500.c | |
| parent | 9959a3082fd364d4500d6a4f910178326309a01f (diff) | |
ux500: Remove i2c devices not avalible in snowball
Dont add i2c devices not avalible for snowball.
Change-Id: I454eb8b097f7bb6b530f5bc0f73251444930a975
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35355
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.c')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 93547a6a6fc..7871be1f8e8 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -575,6 +575,13 @@ static struct i2c_board_info __initdata mop500_i2c0_devices[] = { #define NUM_PRE_V60_I2C0_DEVICES 1 +static struct i2c_board_info __initdata snowball_i2c0_devices[] = { + { + I2C_BOARD_INFO("av8100", 0x70), + .platform_data = &av8100_plat_data, + }, +}; + static struct i2c_board_info __initdata mop500_i2c2_devices[] = { { /* lp5521 LED driver, 1st device */ @@ -1187,12 +1194,6 @@ static void accessory_detect_config(void) static void __init mop500_init_machine(void) { - int i2c0_devs; - -#ifdef CONFIG_REGULATOR - platform_device_register(&u8500_regulator_dev); -#endif - mop500_gpio_keys[0].gpio = GPIO_PROX_SENSOR; mop500_gpio_keys[1].gpio = GPIO_HAL_SENSOR; @@ -1227,12 +1228,6 @@ static void __init mop500_init_machine(void) static void __init snowball_init_machine(void) { - int i2c0_devs; - -#ifdef CONFIG_REGULATOR - platform_device_register(&u8500_regulator_dev); -#endif - u8500_init_devices(); snowball_pins_init(); @@ -1252,10 +1247,8 @@ static void __init snowball_init_machine(void) mop500_spi_init(); mop500_uart_init(); - i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices); - i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs); - i2c_register_board_info(2, mop500_i2c2_devices, - ARRAY_SIZE(mop500_i2c2_devices)); + i2c_register_board_info(0, snowball_i2c0_devices, + ARRAY_SIZE(snowball_i2c0_devices)); /* This board has full regulator constraints */ regulator_has_full_constraints(); @@ -1263,8 +1256,6 @@ static void __init snowball_init_machine(void) static void __init hrefv60_init_machine(void) { - int i2c0_devs; - /* * The HREFv60 board removed a GPIO expander and routed * all these GPIO pins to the internal GPIO controller @@ -1302,10 +1293,10 @@ static void __init hrefv60_init_machine(void) platform_device_register(&ab8500_device); - i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices); - i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs); + i2c_register_board_info(0, mop500_i2c0_devices, + ARRAY_SIZE(mop500_i2c0_devices)); i2c_register_board_info(2, mop500_i2c2_devices, - ARRAY_SIZE(mop500_i2c2_devices)); + ARRAY_SIZE(mop500_i2c2_devices)); /* This board has full regulator constraints */ regulator_has_full_constraints(); |