lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hwmon: (smsc47m1) Differentiate between LPC47M233 and LPC47M292

Browse Source 
The SMSC LPC47M233 and LPC47M292 chips have the same device ID but
are not compatible.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Juerg Haefliger <juergh@gmail.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Jean Delvare
2009-07-28 16:31:39 +02:00
parent 4733fd328f
commit 1b54ab450b
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/hwmon/smsc47m1.c
View File

@@ -86,6 +86,7 @@ superio_exit(void)
#define SUPERIO_REG_ACT 0x30 #define SUPERIO_REG_ACT 0x30
#define SUPERIO_REG_BASE 0x60 #define SUPERIO_REG_BASE 0x60
#define SUPERIO_REG_DEVID 0x20 #define SUPERIO_REG_DEVID 0x20
#define SUPERIO_REG_DEVREV 0x21
/* Logical device registers */ /* Logical device registers */
@@ -429,6 +430,9 @@ static int __init smsc47m1_find(unsigned short *addr,
* The LPC47M292 (device id 0x6B) is somewhat compatible, but it * The LPC47M292 (device id 0x6B) is somewhat compatible, but it
* supports a 3rd fan, and the pin configuration registers are * supports a 3rd fan, and the pin configuration registers are
* unfortunately different. * unfortunately different.
* The LPC47M233 has the same device id (0x6B) but is not compatible.
* We check the high bit of the device revision register to
* differentiate them.
*/ */
switch (val) { switch (val) {
case 0x51: case 0x51:
@@ -448,6 +452,13 @@ static int __init smsc47m1_find(unsigned short *addr,
sio_data->type = smsc47m1; sio_data->type = smsc47m1;
break; break;
case 0x6B: case 0x6B:
if (superio_inb(SUPERIO_REG_DEVREV) & 0x80) {
pr_debug(DRVNAME ": "
"Found SMSC LPC47M233, unsupported\n");
superio_exit();
return -ENODEV;
}
pr_info(DRVNAME ": Found SMSC LPC47M292\n"); pr_info(DRVNAME ": Found SMSC LPC47M292\n");
sio_data->type = smsc47m2; sio_data->type = smsc47m2;
break; break;