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

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

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

Pull hwmon updates from Guenter Roeck:

 - new drivers:
   - Lantiq CPU temperature sensor
   - IBM CFF power supply
   - TPS53679 PMBus driver

 - new support:
   - LM5066I (lm25066 PMBus driver)
   - Intel VID protocol VR13 (PMBus drivers)
   - CAT34TS02C, GT30TS00, GT34TS02, and CAT34TS04 (jc42 driver)

 - cleanup and minor improvements in several drivers

* tag 'hwmon-for-linus-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (36 commits)
  hwmon: (ltq-cputemp) add cpu temp sensor driver
  hwmon: (ltq-cputemp) add devicetree bindings documentation
  hwmon: (pmbus) Add support for Texas Instruments tps53679 device
  hwmon: (asc7621) make several arrays static const
  hwmon: (pmbus/lm25066) Add support for TI LM5066I
  hwmon: (pmbus/lm25066) Offset coefficient depends on CL
  hwmon: (pmbus) Add support for Intel VID protocol VR13
  Documentation: hwmon: Document the IBM CFF power supply
  hwmon: (pmbus) Add IBM Common Form Factor (CFF) power supply driver
  dt-bindings: hwmon: Document the IBM CCF power supply version 1
  hwmon: (ftsteutates) constify i2c_device_id
  hwmon: da9052: Add support for TSI channel
  mfd: da9052: Make touchscreen registration optional
  hwmon: da9052: Replace S_IRUGO with 0444
  mfd: da9052: Add register details for TSI
  hwmon: (aspeed-pwm) add THERMAL dependency
  hwmon: (pmbus) Add debugfs for status registers
  hwmon: (aspeed-pwm-tacho) cooling device support.
  Documentation: dt-bindings: aspeed-pwm-tacho cooling device.
  hwmon: (pmbus): Add generic alarm bit for iin and pin
  ...
parents aa9d4648 7074d0a9

Documentation/devicetree/bindings/hwmon/aspeed-pwm-tacho.txt

+9 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ Required properties for pwm-tacho node: 


- #size-cells : should be 1.



- #cooling-cells: should be 2.



- reg : address and length of the register set for the device.



- pinctrl-names : a pinctrl state named "default" must be defined.
@@ -28,12 +30,17 @@ fan subnode format: 
Under fan subnode there can upto 8 child nodes, with each child node

representing a fan. If there are 8 fans each fan can have one PWM port and

one/two Fan tach inputs.

For PWM port can be configured cooling-levels to create cooling device.

Cooling device could be bound to a thermal zone for the thermal control.



Required properties for each child node:

- reg : should specify PWM source port.

	integer value in the range 0 to 7 with 0 indicating PWM port A and

	7 indicating PWM port H.



- cooling-levels: PWM duty cycle values in a range from 0 to 255

                  which correspond to thermal cooling states.



- aspeed,fan-tach-ch : should specify the Fan tach input channel.

                integer value in the range 0 through 15, with 0 indicating

		Fan tach channel 0 and 15 indicating Fan tach channel 15.
@@ -50,6 +57,7 @@ pwm_tacho_fixed_clk: fixedclk { 
pwm_tacho: pwmtachocontroller@1e786000 {

	#address-cells = <1>;

	#size-cells = <1>;

	#cooling-cells = <2>;

	reg = <0x1E786000 0x1000>;

	compatible = "aspeed,ast2500-pwm-tacho";

	clocks = <&pwm_tacho_fixed_clk>;
@@ -58,6 +66,7 @@ pwm_tacho: pwmtachocontroller@1e786000 { 


	fan@0 {

		reg = <0x00>;

		cooling-levels = /bits/ 8 <125 151 177 203 229 255>;

		aspeed,fan-tach-ch = /bits/ 8 <0x00>;

	};

Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
Device-tree bindings for IBM Common Form Factor Power Supply Version 1

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



Required properties:

 - compatible = "ibm,cffps1";

 - reg = < I2C bus address >;		: Address of the power supply on the

					  I2C bus.



Example:



    i2c-bus@100 {

        #address-cells = <1>;

        #size-cells = <0>;

        #interrupt-cells = <1>;

        < more properties >



        power-supply@68 {

            compatible = "ibm,cffps1";

            reg = <0x68>;

        };

    };

Documentation/devicetree/bindings/hwmon/ltq-cputemp.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
Lantiq cpu temperatur sensor



Requires node properties:

- compatible value :

	"lantiq,cputemp"



Example:

	cputemp@0 {

		compatible = "lantiq,cputemp";

	};

Documentation/hwmon/ftsteutates

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ 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.



To clear a temperature or fan alarm, execute the following command with the

correct path to the alarm file:

	echo 0 >XXXX_alarm



Specification of the chip can be found here:

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

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

Documentation/hwmon/ibm-cffps

0 → 100644
+54 −0
Original line number Diff line number Diff line 
Kernel driver ibm-cffps

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



Supported chips:

  * IBM Common Form Factor power supply



Author: Eddie James <eajames@us.ibm.com>



Description

-----------



This driver supports IBM Common Form Factor (CFF) power supplies. This driver

is a client to the core PMBus driver.



Usage Notes

-----------



This driver does not auto-detect devices. You will have to instantiate the

devices explicitly. Please see Documentation/i2c/instantiating-devices for

details.



Sysfs entries

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



The following attributes are supported:



curr1_alarm		Output current over-current alarm.

curr1_input		Measured output current in mA.

curr1_label		"iout1"



fan1_alarm		Fan 1 warning.

fan1_fault		Fan 1 fault.

fan1_input		Fan 1 speed in RPM.

fan2_alarm		Fan 2 warning.

fan2_fault		Fan 2 fault.

fan2_input		Fan 2 speed in RPM.



in1_alarm		Input voltage under-voltage alarm.

in1_input		Measured input voltage in mV.

in1_label		"vin"

in2_alarm		Output voltage over-voltage alarm.

in2_input		Measured output voltage in mV.

in2_label		"vout1"



power1_alarm		Input fault or alarm.

power1_input		Measured input power in uW.

power1_label		"pin"



temp1_alarm		PSU inlet ambient temperature over-temperature alarm.

temp1_input		Measured PSU inlet ambient temp in millidegrees C.

temp2_alarm		Secondary rectifier temp over-temperature alarm.

temp2_input		Measured secondary rectifier temp in millidegrees C.

temp3_alarm		ORing FET temperature over-temperature alarm.

temp3_input		Measured ORing FET temperature in millidegrees C.

CRA Git | Maintained and supported by SUSTech CRA and CCSE