Commit 16cd9d1c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

Pull hwmon fixes and updates from Jean Delvare:
 "All lm90 driver fixes and improvements"

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  Documentation: dt: hwmon: Add OF document for LM90
  hwmon: (lm90) Add power control
  hwmon: (lm90) Add support for TI TMP451
  hwmon: (lm90) Use enums for the indexes of temp8 and temp11
  hwmon: (lm90) Add support to handle IRQ
  hwmon: (lm90) Define status bits
  hwmon: (lm90) Fix max6696 alarm handling
parents f412f2c6 aae7bce4

Documentation/devicetree/bindings/hwmon/lm90.txt

0 → 100644
+44 −0
Original line number Diff line number Diff line 
* LM90 series thermometer.



Required node properties:

- compatible: manufacturer and chip name, one of

		"adi,adm1032"

		"adi,adt7461"

		"adi,adt7461a"

		"gmt,g781"

		"national,lm90"

		"national,lm86"

		"national,lm89"

		"national,lm99"

		"dallas,max6646"

		"dallas,max6647"

		"dallas,max6649"

		"dallas,max6657"

		"dallas,max6658"

		"dallas,max6659"

		"dallas,max6680"

		"dallas,max6681"

		"dallas,max6695"

		"dallas,max6696"

		"onnn,nct1008"

		"winbond,w83l771"

		"nxp,sa56004"



- reg: I2C bus address of the device



- vcc-supply: vcc regulator for the supply voltage.



Optional properties:

- interrupts: Contains a single interrupt specifier which describes the

              LM90 "-ALERT" pin output.

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



Example LM90 node:



temp-sensor {

	compatible = "onnn,nct1008";

	reg = <0x4c>;

	vcc-supply = <&palmas_ldo6_reg>;

	interrupt-parent = <&gpio>;

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

}

Documentation/hwmon/lm90

+6 −0
Original line number Diff line number Diff line
@@ -122,6 +122,12 @@ Supported chips: 
    Prefix: 'g781'

    Addresses scanned: I2C 0x4c, 0x4d

    Datasheet: Not publicly available from GMT

  * Texas Instruments TMP451

    Prefix: 'tmp451'

    Addresses scanned: I2C 0x4c

    Datasheet: Publicly available at TI website

               http://www.ti.com/litv/pdf/sbos686





Author: Jean Delvare <khali@linux-fr.org>

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -5215,6 +5215,7 @@ M: Jean Delvare <khali@linux-fr.org> 
L:	lm-sensors@lm-sensors.org

S:	Maintained

F:	Documentation/hwmon/lm90

F:	Documentation/devicetree/bindings/hwmon/lm90.txt

F:	drivers/hwmon/lm90.c



LM95234 HARDWARE MONITOR DRIVER

drivers/hwmon/lm90.c

+230 −97

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE