diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-07 15:46:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-07 15:46:25 -0500 |
| commit | cd66acb412d3466bb95d3d7621afbea98647a028 (patch) | |
| tree | caf08b5492d530f2d6ace590eb0d6ee598f3b986 | |
| parent | 9f225788cc047fb7c2ef2326eb4f86dee890e2ef (diff) | |
| parent | 3e78080f81481aa8340374d5a37ae033c1cf4272 (diff) | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon patches from Guenter Roeck:
"Bug fixes for sht15 and ltc2978 driver plus some documentation
updates"
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (sht15) Check return value of regulator_enable()
hwmon: (adt7410) Document ADT7420 support
hwmon: (pmbus/ltc2978) Use detected chip ID to select supported functionality
hwmon: (pmbus/ltc2978) Fix peak attribute handling
hwmon: (pmbus/ltc2978) Update datasheet links
hwmon: Update my e-mail address in driver documentation
| -rw-r--r-- | Documentation/hwmon/adm1275 | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/adt7410 | 11 | ||||
| -rw-r--r-- | Documentation/hwmon/jc42 | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/lineage-pem | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/lm25066 | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/ltc2978 | 6 | ||||
| -rw-r--r-- | Documentation/hwmon/ltc4261 | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/max16064 | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/max16065 | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/max34440 | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/max8688 | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/pmbus | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/smm665 | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/ucd9000 | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/ucd9200 | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/zl6100 | 2 | ||||
| -rw-r--r-- | drivers/hwmon/pmbus/ltc2978.c | 30 | ||||
| -rw-r--r-- | drivers/hwmon/sht15.c | 8 |
18 files changed, 50 insertions, 33 deletions
diff --git a/Documentation/hwmon/adm1275 b/Documentation/hwmon/adm1275 index 2cfa25667123..15b4a20d5062 100644 --- a/Documentation/hwmon/adm1275 +++ b/Documentation/hwmon/adm1275 | |||
| @@ -15,7 +15,7 @@ Supported chips: | |||
| 15 | Addresses scanned: - | 15 | Addresses scanned: - |
| 16 | Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1276.pdf | 16 | Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1276.pdf |
| 17 | 17 | ||
| 18 | Author: Guenter Roeck <guenter.roeck@ericsson.com> | 18 | Author: Guenter Roeck <linux@roeck-us.net> |
| 19 | 19 | ||
| 20 | 20 | ||
| 21 | Description | 21 | Description |
diff --git a/Documentation/hwmon/adt7410 b/Documentation/hwmon/adt7410 index 96004000dc2a..58150c480e56 100644 --- a/Documentation/hwmon/adt7410 +++ b/Documentation/hwmon/adt7410 | |||
| @@ -4,9 +4,14 @@ Kernel driver adt7410 | |||
| 4 | Supported chips: | 4 | Supported chips: |
| 5 | * Analog Devices ADT7410 | 5 | * Analog Devices ADT7410 |
| 6 | Prefix: 'adt7410' | 6 | Prefix: 'adt7410' |
| 7 | Addresses scanned: I2C 0x48 - 0x4B | 7 | Addresses scanned: None |
| 8 | Datasheet: Publicly available at the Analog Devices website | 8 | Datasheet: Publicly available at the Analog Devices website |
| 9 | http://www.analog.com/static/imported-files/data_sheets/ADT7410.pdf | 9 | http://www.analog.com/static/imported-files/data_sheets/ADT7410.pdf |
| 10 | * Analog Devices ADT7420 | ||
| 11 | Prefix: 'adt7420' | ||
| 12 | Addresses scanned: None | ||
| 13 | Datasheet: Publicly available at the Analog Devices website | ||
| 14 | http://www.analog.com/static/imported-files/data_sheets/ADT7420.pdf | ||
| 10 | 15 | ||
| 11 | Author: Hartmut Knaack <knaack.h@gmx.de> | 16 | Author: Hartmut Knaack <knaack.h@gmx.de> |
| 12 | 17 | ||
| @@ -27,6 +32,10 @@ value per second or even justget one sample on demand for power saving. | |||
| 27 | Besides, it can completely power down its ADC, if power management is | 32 | Besides, it can completely power down its ADC, if power management is |
| 28 | required. | 33 | required. |
| 29 | 34 | ||
| 35 | The ADT7420 is register compatible, the only differences being the package, | ||
| 36 | a slightly narrower operating temperature range (-40°C to +150°C), and a | ||
| 37 | better accuracy (0.25°C instead of 0.50°C.) | ||
| 38 | |||
| 30 | Configuration Notes | 39 | Configuration Notes |
| 31 | ------------------- | 40 | ------------------- |
| 32 | 41 | ||
diff --git a/Documentation/hwmon/jc42 b/Documentation/hwmon/jc42 index 165077121238..868d74d6b773 100644 --- a/Documentation/hwmon/jc42 +++ b/Documentation/hwmon/jc42 | |||
| @@ -49,7 +49,7 @@ Supported chips: | |||
| 49 | Addresses scanned: I2C 0x18 - 0x1f | 49 | Addresses scanned: I2C 0x18 - 0x1f |
| 50 | 50 | ||
| 51 | Author: | 51 | Author: |
| 52 | Guenter Roeck <guenter.roeck@ericsson.com> | 52 | Guenter Roeck <linux@roeck-us.net> |
| 53 | 53 | ||
| 54 | 54 | ||
| 55 | Description | 55 | Description |
diff --git a/Documentation/hwmon/lineage-pem b/Documentation/hwmon/lineage-pem index 2ba5ed126858..83b2ddc160c8 100644 --- a/Documentation/hwmon/lineage-pem +++ b/Documentation/hwmon/lineage-pem | |||
| @@ -8,7 +8,7 @@ Supported devices: | |||
| 8 | Documentation: | 8 | Documentation: |
| 9 | http://www.lineagepower.com/oem/pdf/CPLI2C.pdf | 9 | http://www.lineagepower.com/oem/pdf/CPLI2C.pdf |
| 10 | 10 | ||
| 11 | Author: Guenter Roeck <guenter.roeck@ericsson.com> | 11 | Author: Guenter Roeck <linux@roeck-us.net> |
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | Description | 14 | Description |
diff --git a/Documentation/hwmon/lm25066 b/Documentation/hwmon/lm25066 index a21db81c4591..26025e419d35 100644 --- a/Documentation/hwmon/lm25066 +++ b/Documentation/hwmon/lm25066 | |||
| @@ -19,7 +19,7 @@ Supported chips: | |||
| 19 | Datasheet: | 19 | Datasheet: |
| 20 | http://www.national.com/pf/LM/LM5066.html | 20 | http://www.national.com/pf/LM/LM5066.html |
| 21 | 21 | ||
| 22 | Author: Guenter Roeck <guenter.roeck@ericsson.com> | 22 | Author: Guenter Roeck <linux@roeck-us.net> |
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | Description | 25 | Description |
diff --git a/Documentation/hwmon/ltc2978 b/Documentation/hwmon/ltc2978 index c365f9beb5dd..e4d75c606c97 100644 --- a/Documentation/hwmon/ltc2978 +++ b/Documentation/hwmon/ltc2978 | |||
| @@ -5,13 +5,13 @@ Supported chips: | |||
| 5 | * Linear Technology LTC2978 | 5 | * Linear Technology LTC2978 |
| 6 | Prefix: 'ltc2978' | 6 | Prefix: 'ltc2978' |
| 7 | Addresses scanned: - | 7 | Addresses scanned: - |
| 8 | Datasheet: http://cds.linear.com/docs/Datasheet/2978fa.pdf | 8 | Datasheet: http://www.linear.com/product/ltc2978 |
| 9 | * Linear Technology LTC3880 | 9 | * Linear Technology LTC3880 |
| 10 | Prefix: 'ltc3880' | 10 | Prefix: 'ltc3880' |
| 11 | Addresses scanned: - | 11 | Addresses scanned: - |
| 12 | Datasheet: http://cds.linear.com/docs/Datasheet/3880f.pdf | 12 | Datasheet: http://www.linear.com/product/ltc3880 |
| 13 | 13 | ||
| 14 | Author: Guenter Roeck <guenter.roeck@ericsson.com> | 14 | Author: Guenter Roeck <linux@roeck-us.net> |
| 15 | 15 | ||
| 16 | 16 | ||
| 17 | Description | 17 | Description |
diff --git a/Documentation/hwmon/ltc4261 b/Documentation/hwmon/ltc4261 index eba2e2c4b94d..9378a75c6134 100644 --- a/Documentation/hwmon/ltc4261 +++ b/Documentation/hwmon/ltc4261 | |||
| @@ -8,7 +8,7 @@ Supported chips: | |||
| 8 | Datasheet: | 8 | Datasheet: |
| 9 | http://cds.linear.com/docs/Datasheet/42612fb.pdf | 9 | http://cds.linear.com/docs/Datasheet/42612fb.pdf |
| 10 | 10 | ||
| 11 | Author: Guenter Roeck <guenter.roeck@ericsson.com> | 11 | Author: Guenter Roeck <linux@roeck-us.net> |
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | Description | 14 | Description |
diff --git a/Documentation/hwmon/max16064 b/Documentation/hwmon/max16064 index f8b478076f6d..d59cc7829bec 100644 --- a/Documentation/hwmon/max16064 +++ b/Documentation/hwmon/max16064 | |||
| @@ -7,7 +7,7 @@ Supported chips: | |||
| 7 | Addresses scanned: - | 7 | Addresses scanned: - |
| 8 | Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX16064.pdf | 8 | Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX16064.pdf |
| 9 | 9 | ||
| 10 | Author: Guenter Roeck <guenter.roeck@ericsson.com> | 10 | Author: Guenter Roeck <linux@roeck-us.net> |
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | Description | 13 | Description |
diff --git a/Documentation/hwmon/max16065 b/Documentation/hwmon/max16065 index c11f64a1f2ad..208a29e43010 100644 --- a/Documentation/hwmon/max16065 +++ b/Documentation/hwmon/max16065 | |||
| @@ -24,7 +24,7 @@ Supported chips: | |||
| 24 | http://datasheets.maxim-ic.com/en/ds/MAX16070-MAX16071.pdf | 24 | http://datasheets.maxim-ic.com/en/ds/MAX16070-MAX16071.pdf |
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | Author: Guenter Roeck <guenter.roeck@ericsson.com> | 27 | Author: Guenter Roeck <linux@roeck-us.net> |
| 28 | 28 | ||
| 29 | 29 | ||
| 30 | Description | 30 | Description |
diff --git a/Documentation/hwmon/max34440 b/Documentation/hwmon/max34440 index 47651ff341ae..37cbf472a19d 100644 --- a/Documentation/hwmon/max34440 +++ b/Documentation/hwmon/max34440 | |||
| @@ -27,7 +27,7 @@ Supported chips: | |||
| 27 | Addresses scanned: - | 27 | Addresses scanned: - |
| 28 | Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34461.pdf | 28 | Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34461.pdf |
| 29 | 29 | ||
| 30 | Author: Guenter Roeck <guenter.roeck@ericsson.com> | 30 | Author: Guenter Roeck <linux@roeck-us.net> |
| 31 | 31 | ||
| 32 | |||
