summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlvaro G. M <alvaro.gamez@hazent.com>2018-03-22 15:37:44 +0100
committerGuenter Roeck <linux@roeck-us.net>2018-03-22 09:33:24 -0700
commit10ecacd7943b661ed1d365e6d1749edabc2b4721 (patch)
tree6e0be757edfeb7a796b99889c02369c1886d9da0
parent4ff0ce227a1e6570fd5222dae03f4bd2fa9a7c34 (diff)
downloadlinux-10ecacd7943b661ed1d365e6d1749edabc2b4721.tar.bz2
hwmon: (lm92) Add max6635 to lm92_id[]
Since autodetection of this chip was removed, it makes sense to add prefix max6635 so that the device can be instantiated by its actual name. Signed-off-by: Alvaro Gamez Machado <alvaro.gamez@hazent.com> Reviewed-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r--Documentation/hwmon/lm922
-rw-r--r--drivers/hwmon/lm92.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/hwmon/lm92 b/Documentation/hwmon/lm92
index f2a5adcf4ead..cfa99a353b8c 100644
--- a/Documentation/hwmon/lm92
+++ b/Documentation/hwmon/lm92
@@ -11,7 +11,7 @@ Supported chips:
Addresses scanned: none, force parameter needed
Datasheet: http://www.national.com/pf/LM/LM76.html
* Maxim MAX6633/MAX6634/MAX6635
- Prefix: 'lm92'
+ Prefix: 'max6635'
Addresses scanned: none, force parameter needed
Datasheet: http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3074
diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c
index 18509b5af11e..d40fe5122e94 100644
--- a/drivers/hwmon/lm92.c
+++ b/drivers/hwmon/lm92.c
@@ -52,6 +52,7 @@
*/
static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
I2C_CLIENT_END };
+enum chips { lm92, max6635 };
/* The LM92 registers */
#define LM92_REG_CONFIG 0x01 /* 8-bit, RW */
@@ -329,8 +330,8 @@ static int lm92_probe(struct i2c_client *new_client,
*/
static const struct i2c_device_id lm92_id[] = {
- { "lm92", 0 },
- /* max6635 could be added here */
+ { "lm92", lm92 },
+ { "max6635", max6635 },
{ }
};
MODULE_DEVICE_TABLE(i2c, lm92_id);