Commit 507b5007 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus-v4.11' of... 

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

Pull hwmon updates from Guenter Roeck:

 - new driver for stts751

 - it87: Added support for IT8622E and IT8792E; improved support for
   other chips

 - lm70: Added support for TMP122/124

 - use permission-specific DEVICE_ATTR variants where possible

 - fixed overflows in various drivers

 - minor improvements in various drivers

* tag 'hwmon-for-linus-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (95 commits)
  hwmon: (sht15) Add device tree support
  devicetree: add lm90 thermal_zone sensor support
  hwmon: (it87) Add support for IT8792E
  hwmon: (it87) Do not overwrite bit 2..6 of pwm control registers
  hwmon: (it87) Fix pwm4 detection for IT8620 and IT8628
  hwmon: (it87) Ensure that pwm control cache is current before updating values
  hwmon: (it87) Improve IT8622 support
  hwmon: (it87) Add support for IT8622E
  hwmon: (it87) Add feature flag indicating that VIN3 is connected to 5V
  DT: add binding documentation for STTS751
  hwmon: new driver for ST stts751 thermal sensor
  hwmon: Register thermal zone only if 'dev' parameter was provided
  hwmon: Relax name attribute validation for new APIs
  hwmon: Update documentation to clarify rules for the 'name' attribute
  hwmon: Make name attribute mandatory for new APIs
  hwmon: (lm70) Add support for TI TMP122/124
  hwmon: (lm70) Utilize dev_warn instead of pr_warn
  hwmon: (ltc4151) Export OF device ID table as module aliases
  hwmon: (adc128d818) Preserve operation mode
  hwmon: (adc128d818) Support operation modes 1-3
  ...
parents ce1bf979 2f1736ff

Documentation/devicetree/bindings/hwmon/adc128d818.txt

0 → 100644
+38 −0
Original line number Diff line number Diff line 
TI ADC128D818 ADC System Monitor With Temperature Sensor

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



Operation modes:



 - Mode 0:  7 single-ended voltage readings (IN0-IN6),

            1 temperature reading (internal)

 - Mode 1:  8 single-ended voltage readings (IN0-IN7),

            no temperature

 - Mode 2:  4 pseudo-differential voltage readings

              (IN0-IN1, IN3-IN2, IN4-IN5, IN7-IN6),

            1 temperature reading (internal)

 - Mode 3:  4 single-ended voltage readings (IN0-IN3),

            2 pseudo-differential voltage readings

              (IN4-IN5, IN7-IN6),

            1 temperature reading (internal)



If no operation mode is configured via device tree, the driver keeps the

currently active chip operation mode (default is mode 0).





Required node properties:



 - compatible:  must be set to "ti,adc128d818"

 - reg:         I2C address of the device



Optional node properties:



 - ti,mode:     Operation mode (see above).





Example (operation mode 2):



	adc128d818@1d {

		compatible = "ti,adc128d818";

		reg = <0x1d>;

		ti,mode = <2>;

	};

Documentation/devicetree/bindings/hwmon/lm70.txt

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 
- compatible: one of

		"ti,lm70"

		"ti,tmp121"

		"ti,tmp122"

		"ti,lm71"

		"ti,lm74"

Documentation/devicetree/bindings/hwmon/lm90.txt

+6 −0
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ Optional properties: 
              LM90 "-ALERT" pin output.

              See interrupt-controller/interrupts.txt for the format.



- #thermal-sensor-cells: should be set to 1. See thermal/thermal.txt for

	      details. See <include/dt-bindings/thermal/lm90.h> for the

	      definition of the local, remote and 2nd remote sensor index

	      constants.



Example LM90 node:



temp-sensor {
@@ -41,4 +46,5 @@ temp-sensor { 
	vcc-supply = <&palmas_ldo6_reg>;

	interrupt-parent = <&gpio>;

	interrupts = <TEGRA_GPIO(O, 4) IRQ_TYPE_LEVEL_LOW>;

	#thermal-sensor-cells = <1>;

}

Documentation/devicetree/bindings/hwmon/sht15.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
Sensirion SHT15 Humidity and Temperature Sensor



Required properties:



 - "compatible": must be "sensirion,sht15".

 - "data-gpios": GPIO connected to the data line.

 - "clk-gpios": GPIO connected to the clock line.

 - "vcc-supply": regulator that drives the VCC pin.



Example:



	sensor {

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_sensor>;

		compatible = "sensirion,sht15";

		clk-gpios = <&gpio4 12 0>;

		data-gpios = <&gpio4 13 0>;

		vcc-supply = <&reg_sht15>;

	};

Documentation/devicetree/bindings/hwmon/stts751.txt

0 → 100644
+15 −0
Original line number Diff line number Diff line 
* STTS751 thermometer.



Required node properties:

- compatible: "stts751"

- reg: I2C bus address of the device



Optional properties:

- smbus-timeout-disable: when set, the smbus timeout function will be disabled



Example stts751 node:



temp-sensor {

	compatible = "stts751";

	reg = <0x48>;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE