2 files changed, 14 insertions, 3 deletions

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 68cf87749a42..9234c2e2c7d9 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -563,9 +563,10 @@ config SENSORS_LM90
         depends on I2C
         help
           If you say yes here you get support for National Semiconductor LM90,
-          LM86, LM89 and LM99, Analog Devices ADM1032 and ADT7461, and Maxim
+          LM86, LM89 and LM99, Analog Devices ADM1032 and ADT7461, Maxim
           MAX6646, MAX6647, MAX6648, MAX6649, MAX6657, MAX6658, MAX6659,
-          MAX6680, MAX6681 and MAX6692 sensor chips.
+          MAX6680, MAX6681 and MAX6692, and Winbond/Nuvoton W83L771AWG/ASG
+          sensor chips.
 
           This driver can also be built as a module.  If so, the module
           will be called lm90.
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 7c9bdc167426..ddf617f3a713 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -93,7 +93,8 @@
 static const unsigned short normal_i2c[] = {
         0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };
 
-enum chips { lm90, adm1032, lm99, lm86, max6657, adt7461, max6680, max6646 };
+enum chips { lm90, adm1032, lm99, lm86, max6657, adt7461, max6680, max6646,
+        w83l771 };
 
 /*
  * The LM90 registers
@@ -173,6 +174,7 @@ static const struct i2c_device_id lm90_id[] = {
         { "max6659", max6657 },
         { "max6680", max6680 },
         { "max6681", max6680 },
+        { "w83l771", w83l771 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, lm90_id);
@@ -758,6 +760,14 @@ static int lm90_detect(struct i2c_client *new_client,
                  && reg_convrate <= 0x07) {
                         name = "max6646";
                 }
+        } else
+        if (address == 0x4C
+         && man_id == 0x5C) { /* Winbond/Nuvoton */
+                if ((chip_id & 0xFE) == 0x10 /* W83L771AWG/ASG */
+                 && (reg_config1 & 0x2A) == 0x00
+                 && reg_convrate <= 0x08) {
+                        name = "w83l771";
+                }
         }
 
         if (!name) { /* identification failed */