2 files changed, 40 insertions, 9 deletions

diff --git a/Documentation/hwmon/lm75 b/Documentation/hwmon/lm75
index 69af1c7db6b7..5e45d0795986 100644
--- a/Documentation/hwmon/lm75
+++ b/Documentation/hwmon/lm75
@@ -67,7 +67,8 @@ the temperature falls below the Hysteresis value.
 All temperatures are in degrees Celsius, and are guaranteed within a
 range of -55 to +125 degrees.
 
-The LM75 only updates its values each 1.5 seconds; reading it more often
+The driver caches the values for a period varying between 1 second for the
+slowest chips and 125 ms for the fastest chips; reading it more often
 will do no harm, but will return 'old' values.
 
 The original LM75 was typically used in combination with LM78-like chips
@@ -78,8 +79,8 @@ The LM75 is essentially an industry standard; there may be other
 LM75 clones not listed here, with or without various enhancements,
 that are supported. The clones are not detected by the driver, unless
 they reproduce the exact register tricks of the original LM75, and must
-therefore be instantiated explicitly. The specific enhancements (such as
-higher resolution) are not currently supported by the driver.
+therefore be instantiated explicitly. Higher resolution up to 12-bit
+is supported by this driver, other specific enhancements are not.
 
 The LM77 is not supported, contrary to what we pretended for a long time.
 Both chips are simply not compatible, value encoding differs.
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 559e675db3c8..928341115793 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -169,6 +169,7 @@ lm75_probe(struct i2c_client *client, const struct i2c_device_id *id)
         int status;
         u8 set_mask, clr_mask;
         int new;
+        enum lm75_type kind = id->driver_data;
 
         if (!i2c_check_functionality(client->adapter,
                         I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA))
@@ -187,30 +188,59 @@ lm75_probe(struct i2c_client *client, const struct i2c_device_id *id)
         set_mask = 0;
         clr_mask = LM75_SHUTDOWN;               /* continuous conversions */
 
-        switch (id->driver_data) {
+        switch (kind) {
         case adt75:
                 clr_mask |= 1 << 5;             /* not one-shot mode */
+                data->resolution = 12;
+                data->sample_time = HZ / 8;
                 break;
         case ds1775:
         case ds75:
         case stds75:
-                clr_mask |= 3 << 5;             /* 9-bit mode */
+                clr_mask |= 3 << 5;
+                set_mask |= 2 << 5;             /* 11-bit mode */
+                data->resolution = 11;
+                data->sample_time = HZ;
+                break;
+        case lm75:
+        case lm75a:
+                data->resolution = 9;
+                data->sample_time = HZ / 2;
+                break;
+        case max6625:
+                data->resolution = 9;
+                data->sample_time = HZ / 4;
+                break;
+        case max6626:
+                data->resolution = 12;
+                data->resolution_limits = 9;
+                data->sample_time = HZ / 4;
+                break;
+        case tcn75:
+                data->resolution = 9;
+                data->sample_time = HZ / 8;
                 break;
         case mcp980x:
+                data->resolution_limits = 9;
+                /* fall through */
         case tmp100:
         case tmp101:
+                set_mask |= 3 << 5;             /* 12-bit mode */
+                data->resolution = 12;
+                data->sample_time = HZ;
+                clr_mask |= 1 << 7;             /* not one-shot mode */
+                break;
         case tmp105:
         case tmp175:
         case tmp275:
         case tmp75:
-                clr_mask |= 3 << 5;             /* 9-bit mode */
+                set_mask |= 3 << 5;             /* 12-bit mode */
                 clr_mask |= 1 << 7;             /* not one-shot mode */
+                data->resolution = 12;
+                data->sample_time = HZ / 2;
                 break;
         }
 
-        data->resolution = 9;
-        data->sample_time = HZ + HZ / 2;
-
         /* configure as specified */
         status = lm75_read_value(client, LM75_REG_CONF);
         if (status < 0) {