hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hwmon: (adt7475) Improve device detection 

Check the value of register 0x3f as part of the device detection, to
make it more robust.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Jordan Crouse <jordan@cosmicpenguin.net>
Cc: "Darrick J. Wong" <djwong@us.ibm.com>
This commit is contained in:
Jean Delvare 2009-12-09 20:36:04 +01:00
parent 54ecb9e3c1
commit d656b6fde2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/hwmon/adt7475.c
View File

@ -47,6 +47,7 @@
#define REG_DEVID 0x3D #define REG_DEVID 0x3D
#define REG_VENDID 0x3E #define REG_VENDID 0x3E
#define REG_DEVID2 0x3F
#define REG_STATUS1 0x41 #define REG_STATUS1 0x41
#define REG_STATUS2 0x42 #define REG_STATUS2 0x42
@ -1014,18 +1015,22 @@ static int adt7475_detect(struct i2c_client *client, int kind,
struct i2c_board_info *info) struct i2c_board_info *info)
{ {
struct i2c_adapter *adapter = client->adapter; struct i2c_adapter *adapter = client->adapter;
int vendid, devid; int vendid, devid, devid2;
const char *name; const char *name;
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
return -ENODEV; return -ENODEV;
vendid = adt7475_read(REG_VENDID); vendid = adt7475_read(REG_VENDID);
devid = adt7475_read(REG_DEVID); devid2 = adt7475_read(REG_DEVID2);
if (vendid != 0x41 || /* Analog Devices */
(devid2 & 0xf8) != 0x68)
return -ENODEV;
if (vendid == 0x41 && devid == 0x73) devid = adt7475_read(REG_DEVID);
if (devid == 0x73)
name = "adt7473"; name = "adt7473";
else if (vendid == 0x41 && devid == 0x75 && client->addr == 0x2e) else if (devid == 0x75 && client->addr == 0x2e)
name = "adt7475"; name = "adt7475";
else { else {
dev_dbg(&adapter->dev, dev_dbg(&adapter->dev,