diff options
| author | Sachin Nikam <snikam@nvidia.com> | 2012-03-14 12:59:00 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-03-15 18:24:05 -0700 |
| commit | f2d6f91daa52ac0d3bfe1889aa364416043ef219 (patch) | |
| tree | 7f90da43b23ea76667a378f4a420b8ab16bc6cd8 /arch/arm/mach-tegra/board-cardhu-sensors.c | |
| parent | 46e097bdab198a2b4ee0dda48337c2d0ecafda9b (diff) | |
arm: tegra: cardhu: registering ALS based on board sku
If board_info.sku is 0xb11 this board has ltr558 ALS on it
else isl29028 sensor.
Bug 901133
Change-Id: Id0fb5b59b55393e52147e7f9d8d114651a5e0561
Signed-off-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-on: http://git-master/r/89977
Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu-sensors.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu-sensors.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-sensors.c b/arch/arm/mach-tegra/board-cardhu-sensors.c index 13447318cd16..0f7d2f95d54d 100644 --- a/arch/arm/mach-tegra/board-cardhu-sensors.c +++ b/arch/arm/mach-tegra/board-cardhu-sensors.c @@ -845,21 +845,17 @@ static void mpuirq_init(void) ARRAY_SIZE(inv_mpu_i2c2_board_info)); } -#ifdef CONFIG_SENSORS_ISL29028 static struct i2c_board_info cardhu_i2c2_isl_board_info[] = { { I2C_BOARD_INFO("isl29028", 0x44), } }; -#endif -#ifdef CONFIG_SENSORS_LTR558 static struct i2c_board_info cardhu_i2c2_ltr_board_info[] = { { I2C_BOARD_INFO("LTR_558ALS", 0x23), } }; -#endif int __init cardhu_sensors_init(void) { @@ -914,15 +910,12 @@ int __init cardhu_sensors_init(void) i2c_register_board_info(4, cardhu_i2c4_bq27510_board_info, ARRAY_SIZE(cardhu_i2c4_bq27510_board_info)); -#ifdef CONFIG_SENSORS_ISL29028 - i2c_register_board_info(2, cardhu_i2c2_isl_board_info, - ARRAY_SIZE(cardhu_i2c2_isl_board_info)); -#endif - -#ifdef CONFIG_SENSORS_LTR558 - i2c_register_board_info(2, cardhu_i2c2_ltr_board_info, - ARRAY_SIZE(cardhu_i2c2_ltr_board_info)); -#endif + if (board_info.sku == BOARD_SKU_B11) + i2c_register_board_info(2, cardhu_i2c2_ltr_board_info, + ARRAY_SIZE(cardhu_i2c2_ltr_board_info)); + else + i2c_register_board_info(2, cardhu_i2c2_isl_board_info, + ARRAY_SIZE(cardhu_i2c2_isl_board_info)); err = cardhu_nct1008_init(); if (err) |