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

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

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

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

Pull hwmon updates from Guenter Roeck:

 - New drivers for FTS BMC "Teutates", TI INA3221, and Sensirion SHT3x.

 - Added support for Microchip MCP9808 and TI TMP461.

 - Cleanup and minor fixes in various drivers.

* tag 'hwmon-for-linus-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (37 commits)
  Documentation: dtb: xgene: Add hwmon dts binding documentation
  hwmon: (ftsteutates) Remove unused including <linux/version.h>
  hwmon: (adt7411) set bit 3 in CFG1 register
  hwmon: Add driver for FTS BMC chip "Teutates"
  hwmon: (sht3x) add humidity heater element control
  hwmon: (jc42) Add support for generic JC-42.4 devicetree binding
  dt/bindings: Add bindings for JC-42.4 compatible temperature sensors
  hwmon: (tmp102) Convert to use regmap, and drop local cache
  hwmon: (tmp102) Rework chip configuration
  hwmon: (tmp102) Improve handling of initial read delay
  hwmon: (lm90) Drop unnecessary else statements
  hwmon: (lm90) Use bool for valid flag
  hwmon: (lm90) Read limit registers only once
  hwmon: (lm90) Simplify read functions
  hwmon: (lm90) Use devm_hwmon_device_register_with_groups
  hwmon: (lm90) Use devm_add_action for cleanup
  hwmon: (lm75) Convert to use regmap
  hwmon: (lm75) Add update_interval attribute
  hwmon: (lm75) Drop lm75_read_value and lm75_write_value
  hwmon: (lm75) Handle cleanup with devm_add_action
  ...
parents 52770c37 1d3dd4ce

Documentation/devicetree/bindings/hwmon/apm-xgene-hwmon.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
APM X-Gene hwmon driver



APM X-Gene SOC sensors are accessed over the "SLIMpro" mailbox.



Required properties :

 - compatible : should be "apm,xgene-slimpro-hwmon"

 - mboxes : use the label reference for the mailbox as the first parameter.

	    The second parameter is the channel number.



Example :

	hwmonslimpro {

		compatible = "apm,xgene-slimpro-hwmon";

		mboxes = <&mailbox 7>;

	};

Documentation/devicetree/bindings/hwmon/jc42.txt

0 → 100644
+42 −0
Original line number Diff line number Diff line 
Properties for Jedec JC-42.4 compatible temperature sensors



Required properties:

- compatible: May include a device-specific string consisting of the

	      manufacturer and the name of the chip. A list of supported

	      chip names follows.

	      Must include "jedec,jc-42.4-temp" for any Jedec JC-42.4

	      compatible temperature sensor.



	      Supported chip names:

		adi,adt7408

		atmel,at30ts00

		atmel,at30tse004

		onnn,cat6095

		onnn,cat34ts02

		maxim,max6604

		microchip,mcp9804

		microchip,mcp9805

		microchip,mcp9808

		microchip,mcp98243

		microchip,mcp98244

		microchip,mcp9843

		nxp,se97

		nxp,se98

		st,stts2002

		st,stts2004

		st,stts3000

		st,stts424

		st,stts424e

		idt,tse2002

		idt,tse2004

		idt,ts3000

		idt,ts3001



- reg: I2C address



Example:



temp-sensor@1a {

	compatible = "jedec,jc-42.4-temp";

	reg = <0x1a>;

};

Documentation/hwmon/abituguru

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ Supported chips: 
				 AW9D-MAX) (2)

	1) For revisions 2 and 3 uGuru's the driver can autodetect the

	   sensortype (Volt or Temp) for bank1 sensors, for revision 1 uGuru's

	   this doesnot always work. For these uGuru's the autodection can

	   this does not always work. For these uGuru's the autodetection can

	   be overridden with the bank1_types module param. For all 3 known

	   revison 1 motherboards the correct use of this param is:

	   bank1_types=1,1,0,0,0,0,0,2,0,0,0,0,2,0,0,1

Documentation/hwmon/ftsteutates

0 → 100644
+23 −0
Original line number Diff line number Diff line 
Kernel driver ftsteutates

=====================



Supported chips:

  * FTS Teutates

    Prefix: 'ftsteutates'

    Addresses scanned: I2C 0x73 (7-Bit)



Author: Thilo Cestonaro <thilo.cestonaro@ts.fujitsu.com>





Description

-----------

The BMC Teutates is the Eleventh generation of Superior System

monitoring and thermal management solution. It is builds on the basic

functionality of the BMC Theseus and contains several new features and

enhancements. It can monitor up to 4 voltages, 16 temperatures and

8 fans. It also contains an integrated watchdog which is currently

implemented in this driver.



Specification of the chip can be found here:

ftp:///pub/Mainboard-OEM-Sales/Services/Software&Tools/Linux_SystemMonitoring&Watchdog&GPIO/BMC-Teutates_Specification_V1.21.pdf

ftp:///pub/Mainboard-OEM-Sales/Services/Software&Tools/Linux_SystemMonitoring&Watchdog&GPIO/Fujitsu_mainboards-1-Sensors_HowTo-en-US.pdf

Documentation/hwmon/ina3221

0 → 100644
+35 −0
Original line number Diff line number Diff line 
Kernel driver ina3221

=====================



Supported chips:

  * Texas Instruments INA3221

    Prefix: 'ina3221'

    Addresses: I2C 0x40 - 0x43

    Datasheet: Publicly available at the Texas Instruments website

               http://www.ti.com/



Author: Andrew F. Davis <afd@ti.com>



Description

-----------



The Texas Instruments INA3221 monitors voltage, current, and power on the high

side of up to three D.C. power supplies. The INA3221 monitors both shunt drop

and supply voltage, with programmable conversion times and averaging, current

and power are calculated host-side from these.



Sysfs entries

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



in[123]_input           Bus voltage(mV) channels

curr[123]_input         Current(mA) measurement channels

shunt[123]_resistor     Shunt resistance(uOhm) channels

curr[123]_crit          Critical alert current(mA) setting, activates the

                          corresponding alarm when the respective current

                          is above this value

curr[123]_crit_alarm    Critical alert current limit exceeded

curr[123]_max           Warning alert current(mA) setting, activates the

                          corresponding alarm when the respective current

                          average is above this value.

curr[123]_max_alarm     Warning alert current limit exceeded

in[456]_input           Shunt voltage(uV) for channels 1, 2, and 3 respectively