Commit 64ae88ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging 

Pull hwmon updates from Guenter Roeck:

 - Substantial rewrite of lm90 driver to support several additional
   chips and improve support for existing chips.

 - Add support of ROG ZENITH II EXTREME, Maximus XI Hero, and
   Strix Z690-a D4 to asus-ec-sensors driver

 - Add support of F71858AD to f71882fg driver

 - Add support of Aquacomputer Quadro to aquacomputer_d5next driver

 - Improved assembler code and add support for Dell G5 5590 as well as
   XPS 13 7390 in dell-smm driver

 - Add support for ASUS TUF GAMING B550-PLUS WIFI II to nct775 driver

 - Add support for IEEE 754 half precision to PMBus core. Also support
   for Analog Devices LT7182S, improve regulator support, and report
   various MFR register values in debugfs.

 - Various other minor improvements and fixes

* tag 'hwmon-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (85 commits)
  hwmon: (aquacomputer_d5next) Add support for Aquacomputer Quadro fan controller
  hwmon: (dell-smm) Improve documentation
  hwmon: (nct6775) add ASUS TUF GAMING B550-PLUS WIFI II
  hwmon: (occ) Replace open-coded variant of %*phN specifier
  hwmon: (sht15) Fix wrong assumptions in device remove callback
  hwmon: (aquacomputer_d5next) Add support for reading the +12V voltage sensor on D5 Next
  hwmon: (tps23861) fix byte order in current and voltage registers
  hwmon: (aspeed-pwm-tacho) increase fan tach period (again)
  hwmon: (aquacomputer_d5next) Add D5 Next fan control support
  hwmon: (mcp3021) improve driver support for newer hwmon interface
  hwmon: (asus-ec-sensors) add definitions for ROG ZENITH II EXTREME
  hwmon: (aquacomputer_d5next) Move device-specific data into struct aqc_data
  hwmon: (asus-ec-sensors) add missing sensors for X570-I GAMING
  hwmon: (drivetemp) Add module alias
  hwmon: (asus_wmi_sensors) Save a few bytes of memory
  hwmon: (lm90) Use worker for alarm notifications
  hwmon: (asus-ec-sensors) add support for Maximus XI Hero
  hwmon: (dell-smm) Improve assembly code
  hwmon: (pmbus/ltc2978) Set voltage resolution
  hwmon: (pmbus) Add list_voltage to pmbus ops
  ...
parents 530c28df cdbe34da

Documentation/ABI/testing/sysfs-class-hwmon

+9 −0
Original line number Diff line number Diff line
@@ -938,3 +938,12 @@ Description: 
		- 1: enable



		RW



What:		/sys/class/hwmon/hwmonX/device/pec

Description:

		PEC support on I2C devices



		- 0, off, n: disable

		- 1, on, y: enable



		RW

Documentation/devicetree/bindings/hwmon/national,lm90.yaml

+131 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ properties: 
      - adi,adm1032

      - adi,adt7461

      - adi,adt7461a

      - adi,adt7481

      - dallas,max6646

      - dallas,max6647

      - dallas,max6649
@@ -50,6 +51,12 @@ properties: 
  "#thermal-sensor-cells":

    const: 1



  '#address-cells':

    const: 1



  '#size-cells':

    const: 0



  vcc-supply:

    description: phandle to the regulator that provides the +VCC supply
@@ -61,6 +68,29 @@ required: 
  - compatible

  - reg



patternProperties:

  "^channel@([0-2])$":

    type: object

    description: Represents channels of the device and their specific configuration.



    properties:

      reg:

        description: The channel number. 0 is local channel, 1-2 are remote channels.

        items:

          minimum: 0

          maximum: 2



      label:

        description: A descriptive name for this channel, like "ambient" or "psu".



      temperature-offset-millicelsius:

        description: Temperature offset to be added to or subtracted from remote temperature measurements.



    required:

      - reg



    additionalProperties: false



allOf:

  - if:

      not:
@@ -70,12 +100,84 @@ allOf: 
              enum:

                - adi,adt7461

                - adi,adt7461a

                - adi,adt7481

                - ti,tmp451

                - ti,tmp461

    then:

      properties:

        ti,extended-range-enable: false



  - if:

      properties:

        compatible:

          contains:

            enum:

              - dallas,max6646

              - dallas,max6647

              - dallas,max6649

              - dallas,max6657

              - dallas,max6658

              - dallas,max6659

              - dallas,max6695

              - dallas,max6696

    then:

      patternProperties:

        "^channel@([0-2])$":

          properties:

            temperature-offset-millicelsius: false



  - if:

      properties:

        compatible:

          contains:

            enum:

              - adi,adt7461

              - adi,adt7461a

              - adi,adt7481

              - onnn,nct1008

    then:

      patternProperties:

        "^channel@([0-2])$":

          properties:

            temperature-offset-millicelsius:

              maximum: 127750



  - if:

      properties:

        compatible:

          contains:

            enum:

              - adi,adm1032

              - dallas,max6680

              - dallas,max6681

              - gmt,g781

              - national,lm86

              - national,lm89

              - national,lm90

              - national,lm99

              - nxp,sa56004

              - winbond,w83l771

    then:

      patternProperties:

        "^channel@([0-2])$":

          properties:

            temperature-offset-millicelsius:

              maximum: 127875



  - if:

      properties:

        compatible:

          contains:

            enum:

              - ti,tmp451

              - ti,tmp461

    then:

      patternProperties:

        "^channel@([0-2])$":

          properties:

            temperature-offset-millicelsius:

              maximum: 127937



additionalProperties: false



examples:
@@ -94,3 +196,32 @@ examples: 
            #thermal-sensor-cells = <1>;

        };

    };

  - |

    i2c {

      #address-cells = <1>;

      #size-cells = <0>;



      sensor@4c {

        compatible = "adi,adt7481";

        reg = <0x4c>;

        #address-cells = <1>;

        #size-cells = <0>;



        channel@0 {

          reg = <0x0>;

          label = "local";

        };



        channel@1 {

          reg = <0x1>;

          label = "front";

          temperature-offset-millicelsius = <4000>;

        };



        channel@2 {

          reg = <0x2>;

          label = "back";

          temperature-offset-millicelsius = <750>;

        };

      };

    };

Documentation/devicetree/bindings/trivial-devices.yaml

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ properties: 
          - adi,adp5585-02

            # Analog Devices ADP5589 Keypad Decoder and I/O Expansion

          - adi,adp5589

            # Analog Devices LT7182S Dual Channel 6A, 20V PolyPhase Step-Down Silent Switcher

          - adi,lt7182s

            # AMS iAQ-Core VOC Sensor

          - ams,iaq-core

            # i2c serial eeprom (24cxx)

Documentation/hwmon/aquacomputer_d5next.rst

+11 −6
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Supported devices: 
* Aquacomputer Farbwerk RGB controller

* Aquacomputer Farbwerk 360 RGB controller

* Aquacomputer Octo fan controller

* Aquacomputer Quadro fan controller



Author: Aleksa Savic
@@ -33,6 +34,9 @@ better suited for userspace tools. 
The Octo exposes four temperature sensors and eight PWM controllable fans, along

with their speed (in RPM), power, voltage and current.



The Quadro exposes four temperature sensors, a flow sensor and four PWM controllable

fans, along with their speed (in RPM), power, voltage and current.



The Farbwerk and Farbwerk 360 expose four temperature sensors. Depending on the device,

not all sysfs and debugfs entries will be available.
@@ -45,13 +49,14 @@ the kernel and supports hotswapping. 
Sysfs entries

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



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

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

temp[1-4]_input  Temperature sensors (in millidegrees Celsius)

fan[1-2]_input   Pump/fan speed (in RPM)

power[1-2]_input Pump/fan power (in micro Watts)

in[0-2]_input    Pump/fan voltage (in milli Volts)

curr[1-2]_input  Pump/fan current (in milli Amperes)

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

fan[1-8]_input   Pump/fan speed (in RPM) / Flow speed (in dL/h)

power[1-8]_input Pump/fan power (in micro Watts)

in[0-7]_input    Pump/fan voltage (in milli Volts)

curr[1-8]_input  Pump/fan current (in milli Amperes)

pwm[1-8]         Fan PWM (0 - 255)

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



Debugfs entries

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

Documentation/hwmon/asus_ec_sensors.rst

+4 −0
Original line number Diff line number Diff line
@@ -13,12 +13,16 @@ Supported boards: 
 * ROG CROSSHAIR VIII FORMULA

 * ROG CROSSHAIR VIII HERO

 * ROG CROSSHAIR VIII IMPACT

 * ROG MAXIMUS XI HERO

 * ROG MAXIMUS XI HERO (WI-FI)

 * ROG STRIX B550-E GAMING

 * ROG STRIX B550-I GAMING

 * ROG STRIX X570-E GAMING

 * ROG STRIX X570-E GAMING WIFI II

 * ROG STRIX X570-F GAMING

 * ROG STRIX X570-I GAMING

 * ROG STRIX Z690-A GAMING WIFI D4

 * ROG ZENITH II EXTREME



Authors:

    - Eugene Shalygin <eugene.shalygin@gmail.com>