wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-11-07 16:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix chip detection with newer revisions of the DS1621. Reported

Browse Source 
by Peter A. Henning, patch by Aurelien Jarno.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2853 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2005-01-19 22:19:44 +00:00
1 parent 7f5983c5a6
commit ba51b5f66e
1 file changed
+20 -6
Download Patch File Download Diff File Expand all files Collapse all files
kernel/chips/ds1621.c
+20 -6
View File
@@ -43,9 +43,8 @@ SENSORS_INSMOD_1(ds1621);
/* Config register used for detection */
/* 7 6 5 4 3 2 1 0 */
/* |Done|THF |TLF |NVB | 1 | 0 |POL |1SHOT| */
#define DS1621_REG_CONFIG_MASK 0x0C
#define DS1621_REG_CONFIG_VAL 0x08
/* |Done|THF |TLF |NVB | X | X |POL |1SHOT| */
#define DS1621_REG_CONFIG_NVB 0x10
#define DS1621_REG_CONFIG_POLARITY 0x02
#define DS1621_REG_CONFIG_1SHOT 0x01
#define DS1621_REG_CONFIG_DONE 0x80
@@ -165,7 +164,7 @@ static int ds1621_attach_adapter(struct i2c_adapter *adapter)
int ds1621_detect(struct i2c_adapter *adapter, int address,
unsigned short flags, int kind)
{
int i, conf;
int i, conf, temp;
struct i2c_client *new_client;
struct ds1621_data *data;
int err = 0;
@@ -203,11 +202,26 @@ int ds1621_detect(struct i2c_adapter *adapter, int address,
/* Now, we do the remaining detection. It is lousy. */
if (kind < 0) {
/* The NVB bit should be low if no EEPROM write has been
requested during the latest 10ms, which is highly
improbable in our case. */
conf = i2c_smbus_read_byte_data(new_client,
DS1621_REG_CONF);
if ((conf & DS1621_REG_CONFIG_MASK)
!= DS1621_REG_CONFIG_VAL)
if (conf & DS1621_REG_CONFIG_NVB)
goto ERROR1;
/* The 7 lowest bits of a temperature should always be 0. */
temp = ds1621_read_value(new_client,
DS1621_REG_TEMP);
if (temp & 0x007f)
goto exit_free;
temp = ds1621_read_value(new_client,
DS1621_REG_TEMP_MIN);
if (temp & 0x007f)
goto exit_free;
temp = ds1621_read_value(new_client,
DS1621_REG_TEMP_MAX);
if (temp & 0x007f)
goto exit_free;
}
/* Determine the chip type - only one kind supported! */