From f78a6c231021044b013bab3cfbe207b24f459522 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Fri, 18 Mar 2005 22:16:54 +0000 Subject: [PATCH] Change the ADT7463 identification rules. Patch by Philip Pokorny. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2933 7894878c-1315-0410-8ee3-d5d059ff63e0 --- kernel/chips/lm85.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/kernel/chips/lm85.c b/kernel/chips/lm85.c index 2c0b0ad8..8fb26117 100644 --- a/kernel/chips/lm85.c +++ b/kernel/chips/lm85.c @@ -114,6 +114,7 @@ SENSORS_INSMOD_5(lm85b, lm85c, adm1027, adt7463, emc6d100); #define LM85_VERSTEP_LM85B 0x62 #define LM85_VERSTEP_ADM1027 0x60 #define LM85_VERSTEP_ADT7463 0x62 +#define LM85_VERSTEP_ADT7463C 0x6A #define LM85_VERSTEP_EMC6D100_A0 0x60 #define LM85_VERSTEP_EMC6D100_A1 0x61 @@ -780,12 +781,19 @@ int lm85_detect(struct i2c_adapter *adapter, int address, printk("lm85: Unrecgonized version/stepping 0x%02x" " Defaulting to Generic LM85.\n", verstep ); kind = any_chip ; + } else if( company == LM85_COMPANY_ANALOG_DEV + && verstep == LM85_VERSTEP_ADM1027 ) { + kind = adm1027 ; + } else if( company == LM85_COMPANY_ANALOG_DEV + && (verstep == LM85_VERSTEP_ADT7463 + || verstep == LM85_VERSTEP_ADT7463C) ) { + kind = adt7463 ; } else if( company == LM85_COMPANY_ANALOG_DEV && (verstep & LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC) { - if (verstep >= LM85_VERSTEP_ADT7463) - kind = adt7463; - else - kind = adm1027; + printk("lm85: Detected Analog Devices chip\n"); + printk("lm85: Unrecgonized version/stepping 0x%02x" + " Defaulting to Generic LM85.\n", verstep ); + kind = any_chip ; } else if( company == LM85_COMPANY_SMSC && (verstep == LM85_VERSTEP_EMC6D100_A0 || verstep == LM85_VERSTEP_EMC6D100_A1) ) {