diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-herring.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/mach-herring.c b/arch/arm/mach-s5pv210/mach-herring.c index a1577de..9fbeb9a 100644 --- a/arch/arm/mach-s5pv210/mach-herring.c +++ b/arch/arm/mach-s5pv210/mach-herring.c @@ -1342,6 +1342,12 @@ static struct i2c_board_info i2c_devs9[] __initdata = { }, }; +static struct i2c_board_info i2c_devs11[] __initdata = { + { + I2C_BOARD_INFO("gp2a", (0x88 >> 1)), + }, +}; + static struct i2c_board_info i2c_devs12[] __initdata = { { I2C_BOARD_INFO("ak8973b", 0x1c), @@ -1441,6 +1447,11 @@ struct platform_device sec_device_battery = { .id = -1, }; +static struct platform_device opt_gp2a = { + .name = "gp2a-opt", + .id = -1, +}; + static struct platform_device sec_device_rfkill = { .name = "bt_rfkill", .id = -1, @@ -2506,6 +2517,7 @@ static struct platform_device *herring_devices[] __initdata = { &herring_i2c6_device, &herring_i2c7_device, &herring_i2c9_device, /* max1704x:fuel_guage */ + &herring_i2c11_device, /* optical sensor */ &herring_i2c12_device, /* magnetic sensor */ #ifdef CONFIG_USB_GADGET &s3c_device_usbgadget, @@ -2546,6 +2558,7 @@ static struct platform_device *herring_devices[] __initdata = { #ifdef CONFIG_TOUCHSCREEN_QT602240 &s3c_device_qtts, #endif + &opt_gp2a, &sec_device_rfkill, &sec_device_btsleep, }; @@ -2790,6 +2803,8 @@ static void __init herring_machine_init(void) /* FSA9480 */ i2c_register_board_info(7, i2c_devs7, ARRAY_SIZE(i2c_devs7)); i2c_register_board_info(9, i2c_devs9, ARRAY_SIZE(i2c_devs9)); + /* optical sensor */ + i2c_register_board_info(11, i2c_devs11, ARRAY_SIZE(i2c_devs11)); /* magnetic sensor */ i2c_register_board_info(12, i2c_devs12, ARRAY_SIZE(i2c_devs12)); |