From 6d101c588f0fe08ef00f16c1a93762dd5d563df7 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sun, 24 Jul 2011 20:36:15 +0200 Subject: hwmon: (lm90) Make SA56004 detection more robust With a device ID register value of 0, the SA56004 detection is rather weak. Check several other register too to confirm the detection, as we do for other supported devices. Signed-off-by: Jean Delvare Cc: Stijn Devriendt Cc: Guenter Roeck Acked-by: Stijn Devriendt Signed-off-by: Guenter Roeck --- drivers/hwmon/lm90.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'drivers/hwmon') diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c index 7fef2a1194d9..7c6a3df36d86 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c @@ -1283,8 +1283,19 @@ static int lm90_detect(struct i2c_client *new_client, } } } else - if (man_id == 0xA1) { /* NXP Semiconductor/Philips */ - if (chip_id == 0x00 && address >= 0x48 && address <= 0x4F) { + if (address >= 0x48 && address <= 0x4F + && man_id == 0xA1) { /* NXP Semiconductor/Philips */ + int reg_config2; + + reg_config2 = i2c_smbus_read_byte_data(new_client, + LM90_REG_R_CONFIG2); + if (reg_config2 < 0) + return -ENODEV; + + if (chip_id == 0x00 + && (reg_config1 & 0x2A) == 0x00 + && (reg_config2 & 0xFE) == 0x00 + && reg_convrate <= 0x09) { name = "sa56004"; } } -- cgit v1.2.3-59-g8ed1b