Commit 1e19bded authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull hwmon updates from Guenter Roeck:

 - drivers for MAX31785 and MAX6621

 - support for AMD family 17h (Ryzen, Threadripper) temperature sensors

 - various driver cleanups and minor improvements

* tag 'hwmon-for-linus-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (30 commits)
  dt-bindings: pmbus: Add Maxim MAX31785 documentation
  pmbus: Add driver for Maxim MAX31785 Intelligent Fan Controller
  hwmon: (aspeed-pwm-tacho) Sort headers
  hwmon: (xgene) Minor clean up of ifdef and acpi_match_table reference
  hwmon: (max6621) Inverted if condition in max6621_read()
  hwmon: (asc7621) remove redundant assignment to newval
  hwmon: (xgene) Support hwmon v2
  hwmon: (gpio-fan) Fix null pointer dereference at probe
  hwmon: (gpio-fan) Convert to use GPIO descriptors
  hwmon: (gpio-fan) Rename GPIO line state variables
  hwmon: (gpio-fan) Get rid of the gpio alarm struct
  hwmon: (gpio-fan) Get rid of platform data struct
  hwmon: (gpio-fan) Mandate OF_GPIO and cut pdata path
  hwmon: (gpio-fan) Send around device pointer
  hwmon: (gpio-fan) Localize platform data
  hwmon: (gpio-fan) Use local variable pointers
  hwmon: (gpio-fan) Move DT bindings to the right place
  Documentation: devicetree: add max6621 device
  hwmon: (max6621) Add support for Maxim MAX6621 temperature sensor
  hwmon: (w83793) make const array watchdog_minors static, reduces object code size
  ...
parents 1ec16991 ded0eb83

Documentation/devicetree/bindings/hwmon/max1619.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
Bindings for MAX1619 Temperature Sensor



Required properties:

- compatible : "maxim,max1619"

- reg        : I2C address, one of 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, or

               0x4d, 0x4e



Example:

	temp@4c {

		compatible = "maxim,max1619";

		reg = <0x4c>;

	};

Documentation/devicetree/bindings/hwmon/max31785.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
Bindings for the Maxim MAX31785 Intelligent Fan Controller

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



Reference:



https://datasheets.maximintegrated.com/en/ds/MAX31785.pdf



The Maxim MAX31785 is a PMBus device providing closed-loop, multi-channel fan

management with temperature and remote voltage sensing. Various fan control

features are provided, including PWM frequency control, temperature hysteresis,

dual tachometer measurements, and fan health monitoring.



Required properties:

- compatible     : One of "maxim,max31785" or "maxim,max31785a"

- reg            : I2C address, one of 0x52, 0x53, 0x54, 0x55.



Example:



        fans@52 {

                compatible = "maxim,max31785";

                reg = <0x52>;

        };

Documentation/devicetree/bindings/trivial-devices.txt

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ isil,isl29028 Intersil ISL29028 Ambient Light and Proximity Sensor 
isil,isl29030		Intersil ISL29030 Ambient Light and Proximity Sensor

maxim,ds1050		5 Bit Programmable, Pulse-Width Modulator

maxim,max1237		Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs

maxim,max6621		PECI-to-I2C translator for PECI-to-SMBus/I2C protocol conversion

maxim,max6625		9-Bit/12-Bit Temperature Sensors with I²C-Compatible Serial Interface

mc,rv3029c2		Real Time Clock Module with I2C-Bus

mcube,mc3230		mCube 3-axis 8-bit digital accelerometer

Documentation/hwmon/max31785

0 → 100644
+51 −0
Original line number Diff line number Diff line 
Kernel driver max31785

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



Supported chips:

  * Maxim MAX31785, MAX31785A

    Prefix: 'max31785' or 'max31785a'

    Addresses scanned: -

    Datasheet: https://datasheets.maximintegrated.com/en/ds/MAX31785.pdf



Author: Andrew Jeffery <andrew@aj.id.au>



Description

-----------



The Maxim MAX31785 is a PMBus device providing closed-loop, multi-channel fan

management with temperature and remote voltage sensing. Various fan control

features are provided, including PWM frequency control, temperature hysteresis,

dual tachometer measurements, and fan health monitoring.



For dual rotor fan configuration, the MAX31785 exposes the slowest rotor of the

two in the fan[1-4]_input attributes.



Usage Notes

-----------



This driver does not probe for PMBus devices. You will have to instantiate

devices explicitly.



Sysfs attributes

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



fan[1-4]_alarm		Fan alarm.

fan[1-4]_fault		Fan fault.

fan[1-4]_input		Fan RPM.



in[1-6]_crit		Critical maximum output voltage

in[1-6]_crit_alarm	Output voltage critical high alarm

in[1-6]_input		Measured output voltage

in[1-6]_label		"vout[18-23]"

in[1-6]_lcrit		Critical minimum output voltage

in[1-6]_lcrit_alarm	Output voltage critical low alarm

in[1-6]_max		Maximum output voltage

in[1-6]_max_alarm	Output voltage high alarm

in[1-6]_min		Minimum output voltage

in[1-6]_min_alarm	Output voltage low alarm



temp[1-11]_crit		Critical high temperature

temp[1-11]_crit_alarm	Chip temperature critical high alarm

temp[1-11]_input	Measured temperature

temp[1-11]_max		Maximum temperature

temp[1-11]_max_alarm	Chip temperature high alarm

CRA Git | Maintained and supported by SUSTech CRA and CCSE