aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/hwmon/tmp4012
-rw-r--r--drivers/hwmon/tmp401.c9
2 files changed, 5 insertions, 6 deletions
diff --git a/Documentation/hwmon/tmp401 b/Documentation/hwmon/tmp401
index 445ff7b0f6a7..8eb88e974055 100644
--- a/Documentation/hwmon/tmp401
+++ b/Documentation/hwmon/tmp401
@@ -20,7 +20,7 @@ Supported chips:
20 Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp432.html 20 Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp432.html
21 * Texas Instruments TMP435 21 * Texas Instruments TMP435
22 Prefix: 'tmp435' 22 Prefix: 'tmp435'
23 Addresses scanned: I2C 0x4c 23 Addresses scanned: I2C 0x37, 0x48 - 0x4f
24 Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp435.html 24 Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp435.html
25 25
26Authors: 26Authors:
diff --git a/drivers/hwmon/tmp401.c b/drivers/hwmon/tmp401.c
index f2182ee80830..99664ebc738d 100644
--- a/drivers/hwmon/tmp401.c
+++ b/drivers/hwmon/tmp401.c
@@ -44,7 +44,8 @@
44#include <linux/sysfs.h> 44#include <linux/sysfs.h>
45 45
46/* Addresses to scan */ 46/* Addresses to scan */
47static const unsigned short normal_i2c[] = { 0x4c, 0x4d, 0x4e, I2C_CLIENT_END }; 47static const unsigned short normal_i2c[] = { 0x37, 0x48, 0x49, 0x4a, 0x4c, 0x4d,
48 0x4e, 0x4f, I2C_CLIENT_END };
48 49
49enum chips { tmp401, tmp411, tmp431, tmp432, tmp435 }; 50enum chips { tmp401, tmp411, tmp431, tmp432, tmp435 };
50 51
@@ -679,18 +680,16 @@ static int tmp401_detect(struct i2c_client *client,
679 kind = tmp411; 680 kind = tmp411;
680 break; 681 break;
681 case TMP431_DEVICE_ID: 682 case TMP431_DEVICE_ID:
682 if (client->addr == 0x4e) 683 if (client->addr != 0x4c && client->addr != 0x4d)
683 return -ENODEV; 684 return -ENODEV;
684 kind = tmp431; 685 kind = tmp431;
685 break; 686 break;
686 case TMP432_DEVICE_ID: 687 case TMP432_DEVICE_ID:
687 if (client->addr == 0x4e) 688 if (client->addr != 0x4c && client->addr != 0x4d)
688 return -ENODEV; 689 return -ENODEV;
689 kind = tmp432; 690 kind = tmp432;
690 break; 691 break;
691 case TMP435_DEVICE_ID: 692 case TMP435_DEVICE_ID:
692 if (client->addr != 0x4c)
693 return -ENODEV;
694 kind = tmp435; 693 kind = tmp435;
695 break; 694 break;
696 default: 695 default: