diff options
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/trivial-devices.txt | 1 | ||||
| -rw-r--r-- | drivers/hwmon/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/hwmon/lm75.c | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt index ad6a73852f08..c98e5a2934d8 100644 --- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt +++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt | |||
| @@ -35,6 +35,7 @@ fsl,mc13892 MC13892: Power Management Integrated Circuit (PMIC) for i.MX35/51 | |||
| 35 | fsl,mma8450 MMA8450Q: Xtrinsic Low-power, 3-axis Xtrinsic Accelerometer | 35 | fsl,mma8450 MMA8450Q: Xtrinsic Low-power, 3-axis Xtrinsic Accelerometer |
| 36 | fsl,mpr121 MPR121: Proximity Capacitive Touch Sensor Controller | 36 | fsl,mpr121 MPR121: Proximity Capacitive Touch Sensor Controller |
| 37 | fsl,sgtl5000 SGTL5000: Ultra Low-Power Audio Codec | 37 | fsl,sgtl5000 SGTL5000: Ultra Low-Power Audio Codec |
| 38 | gmt,g751 G751: Digital Temperature Sensor and Thermal Watchdog with Two-Wire Interface | ||
| 38 | infineon,slb9635tt Infineon SLB9635 (Soft-) I2C TPM (old protocol, max 100khz) | 39 | infineon,slb9635tt Infineon SLB9635 (Soft-) I2C TPM (old protocol, max 100khz) |
| 39 | infineon,slb9645tt Infineon SLB9645 I2C TPM (new protocol, max 400khz) | 40 | infineon,slb9645tt Infineon SLB9645 I2C TPM (new protocol, max 400khz) |
| 40 | maxim,ds1050 5 Bit Programmable, Pulse-Width Modulator | 41 | maxim,ds1050 5 Bit Programmable, Pulse-Width Modulator |
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index b3ab9d43bb3e..52d548f1dc1d 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig | |||
| @@ -656,6 +656,7 @@ config SENSORS_LM75 | |||
| 656 | 656 | ||
| 657 | - Analog Devices ADT75 | 657 | - Analog Devices ADT75 |
| 658 | - Dallas Semiconductor DS75, DS1775 and DS7505 | 658 | - Dallas Semiconductor DS75, DS1775 and DS7505 |
| 659 | - Global Mixed-mode Technology (GMT) G751 | ||
| 659 | - Maxim MAX6625 and MAX6626 | 660 | - Maxim MAX6625 and MAX6626 |
| 660 | - Microchip MCP980x | 661 | - Microchip MCP980x |
| 661 | - National Semiconductor LM75, LM75A | 662 | - National Semiconductor LM75, LM75A |
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c index c03b490bba81..7e3ef134f1d2 100644 --- a/drivers/hwmon/lm75.c +++ b/drivers/hwmon/lm75.c | |||
| @@ -39,6 +39,7 @@ enum lm75_type { /* keep sorted in alphabetical order */ | |||
| 39 | ds1775, | 39 | ds1775, |
| 40 | ds75, | 40 | ds75, |
| 41 | ds7505, | 41 | ds7505, |
| 42 | g751, | ||
| 42 | lm75, | 43 | lm75, |
| 43 | lm75a, | 44 | lm75a, |
| 44 | max6625, | 45 | max6625, |
| @@ -208,6 +209,7 @@ lm75_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
| 208 | data->resolution = 12; | 209 | data->resolution = 12; |
| 209 | data->sample_time = HZ / 4; | 210 | data->sample_time = HZ / 4; |
| 210 | break; | 211 | break; |
| 212 | case g751: | ||
| 211 | case lm75: | 213 | case lm75: |
| 212 | case lm75a: | 214 | case lm75a: |
| 213 | data->resolution = 9; | 215 | data->resolution = 9; |
| @@ -296,6 +298,7 @@ static const struct i2c_device_id lm75_ids[] = { | |||
| 296 | { "ds1775", ds1775, }, | 298 | { "ds1775", ds1775, }, |
| 297 | { "ds75", ds75, }, | 299 | { "ds75", ds75, }, |
| 298 | { "ds7505", ds7505, }, | 300 | { "ds7505", ds7505, }, |
| 301 | { "g751", g751, }, | ||
| 299 | { "lm75", lm75, }, | 302 | { "lm75", lm75, }, |
| 300 | { "lm75a", lm75a, }, | 303 | { "lm75a", lm75a, }, |
| 301 | { "max6625", max6625, }, | 304 | { "max6625", max6625, }, |
