diff options
-rw-r--r-- | Documentation/hwmon/lm78 | 7 | ||||
-rw-r--r-- | drivers/hwmon/lm78.c | 11 |
2 files changed, 5 insertions, 13 deletions
diff --git a/Documentation/hwmon/lm78 b/Documentation/hwmon/lm78 index 357086ed7f64..fd5dc7a19f0e 100644 --- a/Documentation/hwmon/lm78 +++ b/Documentation/hwmon/lm78 | |||
@@ -2,16 +2,11 @@ Kernel driver lm78 | |||
2 | ================== | 2 | ================== |
3 | 3 | ||
4 | Supported chips: | 4 | Supported chips: |
5 | * National Semiconductor LM78 | 5 | * National Semiconductor LM78 / LM78-J |
6 | Prefix: 'lm78' | 6 | Prefix: 'lm78' |
7 | Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports) | 7 | Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports) |
8 | Datasheet: Publicly available at the National Semiconductor website | 8 | Datasheet: Publicly available at the National Semiconductor website |
9 | http://www.national.com/ | 9 | http://www.national.com/ |
10 | * National Semiconductor LM78-J | ||
11 | Prefix: 'lm78-j' | ||
12 | Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports) | ||
13 | Datasheet: Publicly available at the National Semiconductor website | ||
14 | http://www.national.com/ | ||
15 | * National Semiconductor LM79 | 10 | * National Semiconductor LM79 |
16 | Prefix: 'lm79' | 11 | Prefix: 'lm79' |
17 | Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports) | 12 | Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports) |
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c index 29241469dcba..cf7a2a7f54b5 100644 --- a/drivers/hwmon/lm78.c +++ b/drivers/hwmon/lm78.c | |||
@@ -34,7 +34,7 @@ static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, | |||
34 | static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END }; | 34 | static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END }; |
35 | 35 | ||
36 | /* Insmod parameters */ | 36 | /* Insmod parameters */ |
37 | SENSORS_INSMOD_3(lm78, lm78j, lm79); | 37 | SENSORS_INSMOD_2(lm78, lm79); |
38 | 38 | ||
39 | /* Many LM78 constants specified below */ | 39 | /* Many LM78 constants specified below */ |
40 | 40 | ||
@@ -559,10 +559,9 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind) | |||
559 | /* Determine the chip type. */ | 559 | /* Determine the chip type. */ |
560 | if (kind <= 0) { | 560 | if (kind <= 0) { |
561 | i = lm78_read_value(new_client, LM78_REG_CHIPID); | 561 | i = lm78_read_value(new_client, LM78_REG_CHIPID); |
562 | if (i == 0x00 || i == 0x20) | 562 | if (i == 0x00 || i == 0x20 /* LM78 */ |
563 | || i == 0x40) /* LM78-J */ | ||
563 | kind = lm78; | 564 | kind = lm78; |
564 | else if (i == 0x40) | ||
565 | kind = lm78j; | ||
566 | else if ((i & 0xfe) == 0xc0) | 565 | else if ((i & 0xfe) == 0xc0) |
567 | kind = lm79; | 566 | kind = lm79; |
568 | else { | 567 | else { |
@@ -578,8 +577,6 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind) | |||
578 | 577 | ||
579 | if (kind == lm78) { | 578 | if (kind == lm78) { |
580 | client_name = "lm78"; | 579 | client_name = "lm78"; |
581 | } else if (kind == lm78j) { | ||
582 | client_name = "lm78-j"; | ||
583 | } else if (kind == lm79) { | 580 | } else if (kind == lm79) { |
584 | client_name = "lm79"; | 581 | client_name = "lm79"; |
585 | } | 582 | } |
@@ -788,7 +785,7 @@ static void __exit sm_lm78_exit(void) | |||
788 | 785 | ||
789 | 786 | ||
790 | MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>"); | 787 | MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>"); |
791 | MODULE_DESCRIPTION("LM78, LM78-J and LM79 driver"); | 788 | MODULE_DESCRIPTION("LM78/LM79 driver"); |
792 | MODULE_LICENSE("GPL"); | 789 | MODULE_LICENSE("GPL"); |
793 | 790 | ||
794 | module_init(sm_lm78_init); | 791 | module_init(sm_lm78_init); |