diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 22:56:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 22:56:35 -0400 |
| commit | ddcf6600b133697adbafd96e080818bdc0dfd028 (patch) | |
| tree | f382f8eaca3cc2d298542ae9599ce49884127d0e /Documentation/devicetree/bindings | |
| parent | c16bfeb264decb964742067f02fdd51494e25e64 (diff) | |
| parent | a50d9a4d9ad3c71341788099d733e4151b8a511b (diff) | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
- new driver to support GMT G762/G763 pwm fan controllers
- add support for DS1631, DS1721, and DS1731 to ds1621 driver
- remove detect function from ds1621 driver as unreliable
- bug fixes in nct6775, iio_hwmon, and adm1021 drivers
- remove redundant platform_set_drvdata in various drivers
- add device tree support to ina2xx driver
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (ds1621) Fix temperature rounding operations
hwmon: (nct6775) Drop unsupported fan alarm attributes for NCT6775
hwmon: (nct6775) Fix temperature alarm attributes
Add support for GMT G762/G763 PWM fan controllers
hwmon: (ina2xx) Add device tree support to pass the shunt resistor
hwmon: (ds1621) Update documentation
hwmon: (ds1621) Add DS1731 chip support to ds1621 driver
hwmon: (iio_hwmon) add alias table
hwmon: (adm1021) Do not create min sysfs attributes for LM84
hwmon: (ds1621) Remove detect function
hwmon: (ds1621) Add ds1631 chip support to ds1621 driver and documentation
hwmon: (ds1621) Add ds1721 update interval sysfs attribute
hwmon: (ds1621) Add ds1721 chip support
hwmon: (w83627ehf) Remove redundant platform_set_drvdata()
hwmon: (ntc_thermistor) Remove redundant platform_set_drvdata()
hwmon: (i5k_amb) Remove redundant platform_set_drvdata()
hwmon: (coretemp) Remove redundant platform_set_drvdata()
hwmon: (abituguru3) Remove redundant platform_set_drvdata()
Diffstat (limited to 'Documentation/devicetree/bindings')
| -rw-r--r-- | Documentation/devicetree/bindings/hwmon/g762.txt | 47 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/ina2xx.txt | 22 |
2 files changed, 69 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/hwmon/g762.txt b/Documentation/devicetree/bindings/hwmon/g762.txt new file mode 100644 index 000000000000..25cc6d8ee575 --- /dev/null +++ b/Documentation/devicetree/bindings/hwmon/g762.txt | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | GMT G762/G763 PWM Fan controller | ||
| 2 | |||
| 3 | Required node properties: | ||
| 4 | |||
| 5 | - "compatible": must be either "gmt,g762" or "gmt,g763" | ||
| 6 | - "reg": I2C bus address of the device | ||
| 7 | - "clocks": a fixed clock providing input clock frequency | ||
| 8 | on CLK pin of the chip. | ||
| 9 | |||
| 10 | Optional properties: | ||
| 11 | |||
| 12 | - "fan_startv": fan startup voltage. Accepted values are 0, 1, 2 and 3. | ||
| 13 | The higher the more. | ||
| 14 | |||
| 15 | - "pwm_polarity": pwm polarity. Accepted values are 0 (positive duty) | ||
| 16 | and 1 (negative duty). | ||
| 17 | |||
| 18 | - "fan_gear_mode": fan gear mode. Supported values are 0, 1 and 2. | ||
| 19 | |||
| 20 | If an optional property is not set in .dts file, then current value is kept | ||
| 21 | unmodified (e.g. u-boot installed value). | ||
| 22 | |||
| 23 | Additional information on operational parameters for the device is available | ||
| 24 | in Documentation/hwmon/g762. A detailed datasheet for the device is available | ||
| 25 | at http://natisbad.org/NAS/refs/GMT_EDS-762_763-080710-0.2.pdf. | ||
| 26 | |||
| 27 | Example g762 node: | ||
| 28 | |||
| 29 | clocks { | ||
| 30 | #address-cells = <1>; | ||
| 31 | #size-cells = <0>; | ||
| 32 | |||
| 33 | g762_clk: fixedclk { | ||
| 34 | compatible = "fixed-clock"; | ||
| 35 | #clock-cells = <0>; | ||
| 36 | clock-frequency = <8192>; | ||
| 37 | } | ||
| 38 | } | ||
| 39 | |||
| 40 | g762: g762@3e { | ||
| 41 | compatible = "gmt,g762"; | ||
| 42 | reg = <0x3e>; | ||
| 43 | clocks = <&g762_clk> | ||
| 44 | fan_gear_mode = <0>; /* chip default */ | ||
| 45 | fan_startv = <1>; /* chip default */ | ||
| 46 | pwm_polarity = <0>; /* chip default */ | ||
| 47 | }; | ||
diff --git a/Documentation/devicetree/bindings/i2c/ina2xx.txt b/Documentation/devicetree/bindings/i2c/ina2xx.txt new file mode 100644 index 000000000000..a2ad85d7e747 --- /dev/null +++ b/Documentation/devicetree/bindings/i2c/ina2xx.txt | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | ina2xx properties | ||
| 2 | |||
| 3 | Required properties: | ||
| 4 | - compatible: Must be one of the following: | ||
| 5 | - "ti,ina219" for ina219 | ||
| 6 | - "ti,ina220" for ina220 | ||
| 7 | - "ti,ina226" for ina226 | ||
| 8 | - "ti,ina230" for ina230 | ||
| 9 | - reg: I2C address | ||
| 10 | |||
| 11 | Optional properties: | ||
| 12 | |||
| 13 | - shunt-resistor | ||
| 14 | Shunt resistor value in micro-Ohm | ||
| 15 | |||
| 16 | Example: | ||
| 17 | |||
| 18 | ina220@44 { | ||
| 19 | compatible = "ti,ina220"; | ||
| 20 | reg = <0x44>; | ||
| 21 | shunt-resistor = <1000>; | ||
| 22 | }; | ||