Commit b8e445b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging 

Pull hwmon updates from Guenter Roeck:

 - Add support for trace events to hwmon core

 - Add support for NCT6797D, NCT6798D, MAX31725/6, LTM4686

 - Support all AMD Family 15h Model 6xh and Model 7xh processors in
   k10temp driver

 - Convert ina3221 driver to _info API

 - Fixes, cleanups, and improvements in various drivers

* tag 'hwmon-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (46 commits)
  hwmon: (pmbus) Fix page count auto-detection.
  hwmon: (pmbus) remove redundant 'default n' from Kconfig
  hwmon: (core) Add trace events to _attr_show/store functions
  hwmon: (ina3221) Use _info API to register hwmon device
  hwmon: (npcm-750-pwm-fan) Change initial pwm target to 255
  hwmon: (ina3221) Validate shunt resistor value from DT
  hwmon: (tmp421) make const array 'names' static
  hwmon: (core) Add hwmon_in_enable attribute
  hwmon: (ina3221) mark PM functions as __maybe_unused
  hwmon: (ina3221) Read channel input source info from DT
  dt-bindings: hwmon: Add ina3221 documentation
  hwmon: (ina3221) Add suspend and resume functions
  hwmon: (ina3221) Fix INA3221_CONFIG_MODE macros
  hwmon: (ina3221) Add INA3221_CONFIG to volatile_table
  MAINTAINERS: Update PMBUS maintainer entry
  hwmon: (pwm-fan) Set fan speed to 0 on suspend
  hwmon: (pwm-fan) Silence error on probe deferral
  hwmon: (scpi-hwmon) remove redundant continue
  hwmon: (nct6775) Add support for NCT6798D
  hwmon: (nct6775) Add support for NCT6797D
  ...
parents cff22949 e7c6a556

Documentation/devicetree/bindings/hwmon/ina3221.txt

0 → 100644
+44 −0
Original line number Diff line number Diff line 
Texas Instruments INA3221 Device Tree Bindings



1) ina3221 node

  Required properties:

  - compatible: Must be "ti,ina3221"

  - reg: I2C address



  Optional properties:

  = The node contains optional child nodes for three channels =

  = Each child node describes the information of input source =



  - #address-cells: Required only if a child node is present. Must be 1.

  - #size-cells: Required only if a child node is present. Must be 0.



2) child nodes

  Required properties:

  - reg: Must be 0, 1 or 2, corresponding to IN1, IN2 or IN3 port of INA3221



  Optional properties:

  - label: Name of the input source

  - shunt-resistor-micro-ohms: Shunt resistor value in micro-Ohm



Example:



ina3221@40 {

	compatible = "ti,ina3221";

	reg = <0x40>;

	#address-cells = <1>;

	#size-cells = <0>;



	input@0 {

		reg = <0x0>;

		status = "disabled";

	};

	input@1 {

		reg = <0x1>;

		shunt-resistor-micro-ohms = <5000>;

	};

	input@2 {

		reg = <0x2>;

		label = "VDD_5V";

		shunt-resistor-micro-ohms = <5000>;

	};

};

Documentation/devicetree/bindings/hwmon/ltc2978.txt

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ Required properties: 
  * "lltc,ltm2987"

  * "lltc,ltm4675"

  * "lltc,ltm4676"

  * "lltc,ltm4686"

- reg: I2C slave address



Optional properties:
@@ -30,6 +31,7 @@ Valid names of regulators depend on number of supplies supported per device: 
  * ltc3880, ltc3882, ltc3886 : vout0 - vout1

  * ltc3883 : vout0

  * ltm4676 : vout0 - vout1

  * ltm4686 : vout0 - vout1



Example:

ltc2978@5e {

Documentation/hwmon/ina3221

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ and power are calculated host-side from these. 
Sysfs entries

-------------



in[123]_label           Voltage channel labels

in[123]_enable          Voltage channel enable controls

in[123]_input           Bus voltage(mV) channels

curr[123]_input         Current(mA) measurement channels

shunt[123]_resistor     Shunt resistance(uOhm) channels

Documentation/hwmon/lm75

+3 −3
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ Supported chips: 
    Addresses scanned: none

    Datasheet: Publicly available at the Maxim website

               http://www.maximintegrated.com/

  * Maxim MAX6625, MAX6626

    Prefixes: 'max6625', 'max6626'

  * Maxim MAX6625, MAX6626, MAX31725, MAX31726

    Prefixes: 'max6625', 'max6626', 'max31725', 'max31726'

    Addresses scanned: none

    Datasheet: Publicly available at the Maxim website

               http://www.maxim-ic.com/
@@ -86,7 +86,7 @@ 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. Higher resolution up to 12-bit

therefore be instantiated explicitly. Higher resolution up to 16-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.

Documentation/hwmon/ltc2978

+5 −0
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ Supported chips: 
    Prefix: 'ltm4676'

    Addresses scanned: -

    Datasheet: http://www.linear.com/product/ltm4676

  * Analog Devices LTM4686

    Prefix: 'ltm4686'

    Addresses scanned: -

    Datasheet: http://www.analog.com/ltm4686



Author: Guenter Roeck <linux@roeck-us.net>
@@ -76,6 +80,7 @@ additional components on a single die. The chip is instantiated and reported 
as two separate chips on two different I2C bus addresses.

LTM4675 is a dual 9A or single 18A μModule regulator

LTM4676 is a dual 13A or single 26A uModule regulator.

LTM4686 is a dual 10A or single 20A uModule regulator.





Usage Notes