diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-02-15 15:46:59 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:06:11 +0200 |
| commit | af4ffb547c27243bb50f2ac8862251c61817c233 (patch) | |
| tree | 45c543fc60cfb0a66bbd3408977c209324f26005 | |
| parent | 43df7eff551fdd8b5ce0ca96a1a2db3ad6f30942 (diff) | |
mach-ux500: Fix, update Chipid by reading 0x0F register
Fix update ChipId by reading 0x0F register,this chipid
is used in magnetometer driver to differentiate b/w
lsm303dlh and lsm303dlhc device.
Signed-off-by: Naga Radhesh <naga.radheshy@stericsson.com>
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-sensors.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-sensors.c b/arch/arm/mach-ux500/board-mop500-sensors.c index 492d2a08aa5..e62112de204 100644 --- a/arch/arm/mach-ux500/board-mop500-sensors.c +++ b/arch/arm/mach-ux500/board-mop500-sensors.c @@ -84,7 +84,7 @@ static struct i2c_board_info __initdata mop500_2_i2c2_devices[] = { static struct i2c_board_info __initdata snowball_i2c2_devices[] = { { /* LSM303DLH Accelerometer */ - I2C_BOARD_INFO("lsm303dlh_a", 0x19), + I2C_BOARD_INFO("lsm303dlhc_a", 0x19), .platform_data = &lsm303dlh_pdata, }, }; @@ -220,13 +220,9 @@ static int __init mop500_sensors_init(void) else lsm303dlh_pdata.chip_id = ret; - mop500_sensors_i2c_add(2, mop500_i2c2_devices, - ARRAY_SIZE(mop500_i2c2_devices)); - if (machine_is_snowball()) { if (cpu_is_u8500v21()) - /* This is ugly but we cant know what address - * to use */ + /* This is ugly but we cant know what address to use */ mop500_sensors_probe_add_lsm303dlh_a(); else /* Add the accelerometer with new addr */ mop500_sensors_i2c_add(2, snowball_i2c2_devices, @@ -234,6 +230,9 @@ static int __init mop500_sensors_init(void) } else /* none snowball have the old addr */ mop500_sensors_i2c_add(2, mop500_2_i2c2_devices, ARRAY_SIZE(mop500_2_i2c2_devices)); + + mop500_sensors_i2c_add(2, mop500_i2c2_devices, + ARRAY_SIZE(mop500_i2c2_devices)); return 0; } |