diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 12:45:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 12:45:48 -0400 |
| commit | 92ddcf4a011a95dac98d3bbb0211a2fa42f13dc1 (patch) | |
| tree | ac937fd7cc4d53542c5c299c85df09b1b87bf1c8 | |
| parent | 000a74f41e601bc4e36a760aa42f219a019c5391 (diff) | |
| parent | 6445e6600fa632448cac64e71119310378464ad9 (diff) | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon update from Guenter Roeck:
- New drivers for NCT6775, NCT6776, NCT6779, and LM95234.
- Added support for LTC2974, LTC3883, LM25056, TMP431, TMP432, ADT7310,
and ADT7320 to existing drivers.
- Various code cleanups and minor improvements.
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (54 commits)
hwmon: (nct6775) Fix coding style problems
hwmon: (nct6775) Constify strings
hwmon: (tmp401) Add support for TMP432
hwmon: (tmp401) Add support for update_interval attribute
hwmon: (tmp401) Reset valid flag when resetting temperature history
hwmon: (tmp401) Simplification and cleanup
hwmon: (tmp401) Use sysfs_create_group / sysfs_remove_group
hwmon: (tmp401) Drop unused defines, use BIT for bit masks
hwmon: (nct6775) Use ARRAY_SIZE for loops where possible
documentation: hwmon: Fix typo in documentation/hwmon
hwmon: (nct6775) Enable both AUXTIN and VIN3 on NCT6776
hwmon: (ad7314) use spi_get_drvdata() and spi_set_drvdata()
MAINTAINERS: Add myself as maintainer for the NCT6775 driver
hwmon: (nct6775) Expand scope of supported chips
hwmon: (gpio-fan) Use is_visible to determine if attributes should be created
hwmon: (tmp401) Fix device detection for TMP411B and TMP411C
hwmon: Add driver for LM95234
hwmon: (tmp401) Add support for TMP431
hwmon: (pmbus/lm25066) Add support for LM25056
hwmon: (pmbus/lm25066) Refactor device specific coefficients
...
77 files changed, 7862 insertions, 1793 deletions
diff --git a/Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt b/Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt new file mode 100644 index 000000000000..c6f66674f19c --- /dev/null +++ b/Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | NTC Thermistor hwmon sensors | ||
| 2 | ------------------------------- | ||
| 3 | |||
| 4 | Requires node properties: | ||
| 5 | - "compatible" value : one of | ||
| 6 | "ntc,ncp15wb473" | ||
| 7 | "ntc,ncp18wb473" | ||
| 8 | "ntc,ncp21wb473" | ||
| 9 | "ntc,ncp03wb473" | ||
| 10 | "ntc,ncp15wl333" | ||
| 11 | - "pullup-uv" Pull up voltage in micro volts | ||
| 12 | - "pullup-ohm" Pull up resistor value in ohms | ||
| 13 | - "pulldown-ohm" Pull down resistor value in ohms | ||
| 14 | - "connected-positive" Always ON, If not specified. | ||
| 15 | Status change is possible. | ||
| 16 | - "io-channels" Channel node of ADC to be used for | ||
| 17 | conversion. | ||
| 18 | |||
| 19 | Read more about iio bindings at | ||
| 20 | Documentation/devicetree/bindings/iio/iio-bindings.txt | ||
| 21 | |||
| 22 | Example: | ||
| 23 | ncp15wb473@0 { | ||
| 24 | compatible = "ntc,ncp15wb473"; | ||
| 25 | pullup-uv = <1800000>; | ||
| 26 | pullup-ohm = <47000>; | ||
| 27 | pulldown-ohm = <0>; | ||
| 28 | io-channels = <&adc 3>; | ||
| 29 | }; | ||
diff --git a/Documentation/hwmon/adt7410 b/Documentation/hwmon/adt7410 index 58150c480e56..9817941e5f19 100644 --- a/Documentation/hwmon/adt7410 +++ b/Documentation/hwmon/adt7410 | |||
| @@ -12,29 +12,42 @@ Supported chips: | |||
| 12 | Addresses scanned: None | 12 | Addresses scanned: None |
| 13 | Datasheet: Publicly available at the Analog Devices website | 13 | Datasheet: Publicly available at the Analog Devices website |
| 14 | http://www.analog.com/static/imported-files/data_sheets/ADT7420.pdf | 14 | http://www.analog.com/static/imported-files/data_sheets/ADT7420.pdf |
| 15 | * Analog Devices ADT7310 | ||
| 16 | Prefix: 'adt7310' | ||
| 17 | Addresses scanned: None | ||
| 18 | Datasheet: Publicly available at the Analog Devices website | ||
| 19 | http://www.analog.com/static/imported-files/data_sheets/ADT7310.pdf | ||
| 20 | * Analog Devices ADT7320 | ||
| 21 | Prefix: 'adt7320' | ||
| 22 | Addresses scanned: None | ||
| 23 | Datasheet: Publicly available at the Analog Devices website | ||
| 24 | http://www.analog.com/static/imported-files/data_sheets/ADT7320.pdf | ||
| 15 | 25 | ||
| 16 | Author: Hartmut Knaack <knaack.h@gmx.de> | 26 | Author: Hartmut Knaack <knaack.h@gmx.de> |
| 17 | 27 | ||
| 18 | Description | 28 | Description |
| 19 | ----------- | 29 | ----------- |
| 20 | 30 | ||
| 21 | The ADT7410 is a temperature sensor with rated temperature range of -55°C to | 31 | The ADT7310/ADT7410 is a temperature sensor with rated temperature range of |
| 22 | +150°C. It has a high accuracy of +/-0.5°C and can be operated at a resolution | 32 | -55°C to +150°C. It has a high accuracy of +/-0.5°C and can be operated at a |
| 23 | of 13 bits (0.0625°C) or 16 bits (0.0078°C). The sensor provides an INT pin to | 33 | resolution of 13 bits (0.0625°C) or 16 bits (0.0078°C). The sensor provides an |
| 24 | indicate that a minimum or maximum temperature set point has been exceeded, as | 34 | INT pin to indicate that a minimum or maximum temperature set point has been |
| 25 | well as a critical temperature (CT) pin to indicate that the critical | 35 | exceeded, as well as a critical temperature (CT) pin to indicate that the |
