Commit 076f222a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-v5.19-rc1' of... 

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

Pull hwmon updates from Guenter Roeck:
 "New drivers:

   - Driver for the Microchip LAN966x SoC

   - PMBus driver for Infineon Digital Multi-phase xdp152 family
     controllers

  Chip support added to existing drivers:

   - asus-ec-sensors:
      - Support for ROG STRIX X570-E GAMING WIFI II, PRIME X470-PRO, and
        ProArt X570 Creator WIFI
      - External temperature sensor support for ASUS WS X570-ACE

   - nct6775:
      - Support for I2C driver
      - Support for ASUS PRO H410T / PRIME H410M-R /
        ROG X570-E GAMING WIFI II

   - lm75:
      - Support for - Atmel AT30TS74

   - pmbus/max16601:
      - Support for MAX16602

   - aquacomputer_d5next:
      - Support for Aquacomputer Farbwerk
      - Support for Aquacomputer Octo

   - jc42:
      - Support for S-34TS04A

  Kernel API changes / clarifications:

   - The chip parameter of with_info API is now mandatory

   - New hwmon_device_register_for_thermal API call for use by the
     thermal subsystem

  Improvements:

   - PMBus and JC42 drivers now register with thermal subsystem

   - PMBus drivers now support get_voltage/set_voltage power operations

   - The adt7475 driver now supports pin configuration

   - The lm90 driver now supports setting extended range temperatures
     configuration with a devicetree property

   - The dell-smm driver now registers as cooling device

   - The OCC driver delays hwmon registration until requested by
     userspace

  ... and various other minor fixes and improvements"

* tag 'hwmon-for-v5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (71 commits)
  hwmon: (aquacomputer_d5next) Fix an error handling path in aqc_probe()
  hwmon: (sl28cpld) Fix typo in comment
  hwmon: (pmbus) Check PEC support before reading other registers
  hwmon: (dimmtemp) Fix bitmap handling
  hwmon: (lm90) enable extended range according to DTS node
  dt-bindings: hwmon: lm90: add ti,extended-range-enable property
  dt-bindings: hwmon: lm90: add missing ti,tmp461
  hwmon: (ibmaem) Directly use ida_alloc()/free()
  hwmon: Directly use ida_alloc()/free()
  hwmon: (asus-ec-sensors) fix Formula VIII definition
  dt-bindings: trivial-devices: Add xdp152
  hwmon: (sl28cpld-hwmon) Use HWMON_CHANNEL_INFO macro
  hwmon: (pwm-fan) Use HWMON_CHANNEL_INFO macro
  hwmon: (peci/dimmtemp) Use HWMON_CHANNEL_INFO macro
  hwmon: (peci/cputemp) Use HWMON_CHANNEL_INFO macro
  hwmon: (mr75203) Use HWMON_CHANNEL_INFO macro
  hwmon: (ltc2992) Use HWMON_CHANNEL_INFO macro
  hwmon: (as370-hwmon) Use HWMON_CHANNEL_INFO macro
  hwmon: Make chip parameter for with_info API mandatory
  thermal/drivers/thermal_hwmon: Use hwmon_device_register_for_thermal()
  ...
parents 0350785b 8877ecb0

Documentation/devicetree/bindings/hwmon/adt7475.yaml

+22 −0
Original line number Diff line number Diff line
@@ -61,6 +61,26 @@ patternProperties: 
    $ref: /schemas/types.yaml#/definitions/uint32

    enum: [0, 1]



  "adi,pin(5|10)-function":

    description: |

      Configures the function for pin 5 on the adi,adt7473 and adi,adt7475. Or

      pin 10 on the adi,adt7476 and adi,adt7490.

    $ref: /schemas/types.yaml#/definitions/string

    enum:

      - pwm2

      - smbalert#



  "adi,pin(9|14)-function":

    description: |

      Configures the function for pin 9 on the adi,adt7473 and adi,adt7475. Or

      pin 14 on the adi,adt7476 and adi,adt7490

    $ref: /schemas/types.yaml#/definitions/string

    enum:

      - tach4

      - therm#

      - smbalert#

      - gpio



required:

  - compatible

  - reg
@@ -79,6 +99,8 @@ examples: 
        adi,bypass-attenuator-in0 = <1>;

        adi,bypass-attenuator-in1 = <0>;

        adi,pwm-active-state = <1 0 1>;

        adi,pin10-function = "smbalert#";

        adi,pin14-function = "tach4";

      };

    };

Documentation/devicetree/bindings/hwmon/lm75.yaml

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ properties: 
  compatible:

    enum:

      - adi,adt75

      - atmel,at30ts74

      - dallas,ds1775

      - dallas,ds75

      - dallas,ds7505

Documentation/devicetree/bindings/hwmon/microchip,lan966x.yaml

0 → 100644
+53 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/hwmon/microchip,lan966x.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Microchip LAN966x Hardware Monitor



maintainers:

  - Michael Walle <michael@walle.cc>



description: |

  Microchip LAN966x temperature monitor and fan controller



properties:

  compatible:

    enum:

      - microchip,lan9668-hwmon



  reg:

    items:

      - description: PVT registers

      - description: FAN registers



  reg-names:

    items:

      - const: pvt

      - const: fan



  clocks:

    maxItems: 1



  '#thermal-sensor-cells':

    const: 0



required:

  - compatible

  - reg

  - reg-names

  - clocks



additionalProperties: false



examples:

  - |

    hwmon: hwmon@e2010180 {

        compatible = "microchip,lan9668-hwmon";

        reg = <0xe2010180 0xc>,

              <0xe20042a8 0xc>;

        reg-names = "pvt", "fan";

        clocks = <&sys_clk>;

        #thermal-sensor-cells = <0>;

    };

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

+20 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ properties: 
      - nxp,sa56004

      - onnn,nct1008

      - ti,tmp451

      - ti,tmp461

      - winbond,w83l771
@@ -52,10 +53,29 @@ properties: 
  vcc-supply:

    description: phandle to the regulator that provides the +VCC supply



  ti,extended-range-enable:

    description: Set to enable extended range temperature.

    type: boolean



required:

  - compatible

  - reg



allOf:

  - if:

      not:

        properties:

          compatible:

            contains:

              enum:

                - adi,adt7461

                - adi,adt7461a

                - ti,tmp451

                - ti,tmp461

    then:

      properties:

        ti,extended-range-enable: false



additionalProperties: false



examples:

Documentation/devicetree/bindings/hwmon/nuvoton,nct6775.yaml

0 → 100644
+57 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---



$id: http://devicetree.org/schemas/hwmon/nuvoton,nct6775.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Nuvoton NCT6775 and compatible Super I/O chips



maintainers:

  - Zev Weiss <zev@bewilderbeest.net>



properties:

  compatible:

    enum:

      - nuvoton,nct6106

      - nuvoton,nct6116

      - nuvoton,nct6775

      - nuvoton,nct6776

      - nuvoton,nct6779

      - nuvoton,nct6791

      - nuvoton,nct6792

      - nuvoton,nct6793

      - nuvoton,nct6795

      - nuvoton,nct6796

      - nuvoton,nct6797

      - nuvoton,nct6798



  reg:

    maxItems: 1



  nuvoton,tsi-channel-mask:

    description:

      Bitmask indicating which TSI temperature sensor channels are

      active.  LSB is TSI0, bit 1 is TSI1, etc.

    $ref: /schemas/types.yaml#/definitions/uint32

    maximum: 0xff

    default: 0



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        superio@4d {

            compatible = "nuvoton,nct6779";

            reg = <0x4d>;

            nuvoton,tsi-channel-mask = <0x03>;

        };

    };