Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7629bac6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull hwmon updates from Guenter Roeck:

 - Add support for LM96000, DPS-650AB to existing drivers

 - Use permission specific SENSOR[_DEVICE]_ATTR variants in several
   drivers

 - Replace S_<PERMS> with octal values in several drivers

 - Update some license headers

 - Various minor fixes and improvements in several drivers

* tag 'hwmon-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (89 commits)
  dt-bindings: hwmon: Add missing documentation for lm75
  hwmon: (ad7418) Add device tree probing
  hwmon: (ad741x) Add DT bindings for Analog Devices AD741x
  hwmon: (ntc_thermistor) Convert to new hwmon API
  hwmon: (pwm-fan) Add optional regulator support
  dt-bindings: hwmon: Add optional regulator support to pwm-fan
  hwmon: (f71882fg) Mark expected switch fall-through
  hwmon: (ad7418) Catch I2C errors
  hwmon: (lm85) add support for LM96000 high frequencies
  hwmon: (lm85) support the LM96000
  dt-bindings: Add LM96000 as a trivial device
  hwmon: (lm85) remove freq_map size hardcodes
  hwmon: (occ) Fix license headers
  hwmon: (via-cputemp) Use permission specific SENSOR[_DEVICE]_ATTR variants
  hwmon: (vexpress-hwmon) Use permission specific SENSOR[_DEVICE]_ATTR variants
  hwmon: (tmp421) Replace S_<PERMS> with octal values
  hwmon: (tmp103) Use permission specific SENSOR[_DEVICE]_ATTR variants
  hwmon: (tmp102) Replace S_<PERMS> with octal values
  hwmon: (tc74) Use permission specific SENSOR[_DEVICE]_ATTR variants
  hwmon: (tc654) Use permission specific SENSOR[_DEVICE]_ATTR variants
  ...
parents dcc75dde 985e2251

Documentation/devicetree/bindings/hwmon/ad741x.txt

0 → 100644
+15 −0
Original line number Diff line number Diff line 
* AD7416/AD7417/AD7418 Temperature Sensor Device Tree Bindings



Required properties:

- compatible: one of

		"adi,ad7416"

		"adi,ad7417"

		"adi,ad7418"

- reg: I2C address



Example:



hwmon@28 {

	compatible = "adi,ad7418";

	reg = <0x28>;

};

Documentation/devicetree/bindings/hwmon/dps650ab.txt

0 → 100644
+11 −0
Original line number Diff line number Diff line 
Bindings for Delta Electronics DPS-650-AB power supply



Required properties:

- compatible : "delta,dps650ab"

- reg        : I2C address, one of 0x58, 0x59.



Example:

	dps650ab@58 {

		    compatible = "delta,dps650ab";

		    reg = <0x58>;

	};

Documentation/devicetree/bindings/hwmon/hih6130.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
Honeywell Humidicon HIH-6130 humidity/temperature sensor

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



Requires node properties:

- compatible : "honeywell,hi6130"

- reg : the I2C address of the device. This is 0x27.



Example:

	hih6130@27 {

		compatible = "honeywell,hih6130";

		reg = <0x27>;

	};

Documentation/devicetree/bindings/hwmon/ina3221.txt

+10 −0
Original line number Diff line number Diff line
@@ -6,6 +6,16 @@ Texas Instruments INA3221 Device Tree Bindings 
  - reg: I2C address



  Optional properties:

  - ti,single-shot: This chip has two power modes: single-shot (chip takes one

                    measurement and then shuts itself down) and continuous (

                    chip takes continuous measurements). The continuous mode is

                    more reliable and suitable for hardware monitor type device,

                    but the single-shot mode is more power-friendly and useful

                    for battery-powered device which cares power consumptions

                    while still needs some measurements occasionally.

                    If this property is present, the single-shot mode will be

                    used, instead of the default continuous one for monitoring.



  = The node contains optional child nodes for three channels =

  = Each child node describes the information of input source =

Documentation/devicetree/bindings/hwmon/lm75.txt

0 → 100644
+37 −0
Original line number Diff line number Diff line 
*LM75 hwmon sensor.



Required properties:

- compatible: manufacturer and chip name, one of

		"adi,adt75",

		"dallas,ds1775",

		"dallas,ds75",

		"dallas,ds7505",

		"gmt,g751",

		"national,lm75",

		"national,lm75a",

		"national,lm75b",

		"maxim,max6625",

		"maxim,max6626",

		"maxim,max31725",

		"maxim,max31726",

		"maxim,mcp980x",

		"st,stds75",

		"st,stlm75",

		"microchip,tcn75",

		"ti,tmp100",

		"ti,tmp101",

		"ti,tmp105",

		"ti,tmp112",

		"ti,tmp175",

		"ti,tmp275",

		"ti,tmp75",

		"ti,tmp75c",



- reg: I2C bus address of the device



Example:



sensor@48 {

	compatible = "st,stlm75";

	reg = <0x48>;

};