Commit 76c21d22 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull hwmon updates from Guenter Roeck:
 "New drivers:
   - KEBA fan controller
   - KEBA battery monitoring controller
   - MAX77705

  Support added to existing drivers:
   - MAXIMUS VI HERO and ROG MAXIMUS Z90 Formula support (asus-ec-sensors)
   - SQ52206 support (ina238)
   - lt3074 support (pmbus/lt3074)
   - ADPM12160 support (pmbus/max34440)
   - MPM82504 and for MPM3695 family support (pmbus/mpq8785)
   - Add the Dell OptiPlex 7050 to the DMI whitelist (dell-smm)
   - Zen5 Ryzen Desktop support (k10temp)

  Various other minor fixes and improvements"

* tag 'hwmon-for-v6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (48 commits)
  doc: hwmon: acpi_power_meter: Add information about enabling the power capping feature.
  hwmon: (isl28022) Fix current reading calculation
  hwmon: (lm75) Fix I3C transfer buffer pointer for incoming data
  hwmon: Add KEBA fan controller support
  hwmon: pmbus: mpq8785: Add support for MPM3695 family
  hwmon: pmbus: mpq8785: Add support for MPM82504
  hwmon: pmbus: mpq8785: Implement VOUT feedback resistor divider ratio configuration
  hwmon: pmbus: mpq8785: Prepare driver for multiple device support
  dt-bindings: hwmon: Add bindings for mpq8785 driver
  hwmon: (ina238) Modify the calculation formula to adapt to different chips
  hwmon: (ina238) Add support for SQ52206
  dt-bindings: Add SQ52206 to ina2xx devicetree bindings
  hwmon: (ina238) Add ina238_config to save configurations for different chips
  hwmon: (ausus-ec-sensors) add MAXIMUS VI HERO.
  hwmon: (isl28022, nct7363) Convert to use maple tree register cache
  hwmon: (asus-ec-sensors) check sensor index in read_string()
  hwmon: (asus-ec-sensors) add ROG MAXIMUS Z90 Formula.
  dt-bindings: hwmon: Add Sophgo SG2044 external hardware monitor support
  hwmon: (max77705) Add initial support
  hwmon: (tmp102) add vcc regulator support
  ...
parents f5164456 46d40b24

Documentation/devicetree/bindings/hwmon/pmbus/adi,lt3074.yaml

0 → 100644
+50 −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/pmbus/adi,lt3074.yaml#

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



title: Analog Devices LT3074 voltage regulator



maintainers:

  - Cedric Encarnacion <cedricjustine.encarnacion@analog.com>



description: |

  The LT3074 is a low voltage, ultra-low noise and ultra-fast transient

  response linear regulator. It allows telemetry for input/output voltage,

  output current and temperature through the PMBus serial interface.



  Datasheet:

    https://www.analog.com/en/products/lt3074.html



allOf:

  - $ref: /schemas/regulator/regulator.yaml#



properties:

  compatible:

    enum:

      - adi,lt3074



  reg:

    maxItems: 1



required:

  - compatible

  - reg



unevaluatedProperties: false



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        regulator@6d {

            compatible = "adi,lt3074";

            reg = <0x6d>;

            regulator-name = "vout";

            regulator-max-microvolt = <1250000>;

            regulator-min-microvolt = <1150000>;

        };

    };

Documentation/devicetree/bindings/hwmon/pmbus/mps,mpq8785.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/hwmon/pmbus/mps,mpq8785.yaml#

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



title: Monolithic Power Systems Multiphase Voltage Regulators with PMBus



maintainers:

  - Charles Hsu <ythsu0511@gmail.com>



description:

  Monolithic Power Systems digital multiphase voltage regulators with PMBus.



properties:

  compatible:

    enum:

      - mps,mpm3695

      - mps,mpm3695-25

      - mps,mpm82504

      - mps,mpq8785



  reg:

    maxItems: 1



  mps,vout-fb-divider-ratio-permille:

    description:

      The feedback resistor divider ratio, expressed in permille

      (Vfb / Vout * 1000). This value is written to the PMBUS_VOUT_SCALE_LOOP

      register and is required for correct output voltage presentation.

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

    minimum: 1

    maximum: 4095

    default: 706



required:

  - compatible

  - reg



allOf:

  - if:

      properties:

        compatible:

          enum:

            - mps,mpm3695

            - mps,mpm82504

    then:

      properties:

        mps,vout-fb-divider-ratio-permille:

          maximum: 1023



  - if:

      properties:

        compatible:

          const: mps,mpq8785

    then:

      properties:

        mps,vout-fb-divider-ratio-permille:

          maximum: 2047



additionalProperties: false



examples:

  - |

    i2c {

      #address-cells = <1>;

      #size-cells = <0>;



      pmic@30 {

        compatible = "mps,mpm82504";

        reg = <0x30>;

        mps,vout-fb-divider-ratio-permille = <600>;

      };

    };

Documentation/devicetree/bindings/hwmon/sophgo,sg2042-hwmon-mcu.yaml

+5 −1
Original line number Diff line number Diff line
@@ -11,7 +11,11 @@ maintainers: 


properties:

  compatible:

    const: sophgo,sg2042-hwmon-mcu

    oneOf:

      - items:

          - const: sophgo,sg2044-hwmon-mcu

          - const: sophgo,sg2042-hwmon-mcu

      - const: sophgo,sg2042-hwmon-mcu



  reg:

    maxItems: 1

Documentation/devicetree/bindings/hwmon/ti,amc6821.yaml

+17 −1
Original line number Diff line number Diff line
@@ -28,6 +28,17 @@ properties: 
  i2c-mux:

    type: object



  fan:

    $ref: fan-common.yaml#

    unevaluatedProperties: false



  "#pwm-cells":

    const: 2

    description: |

      Number of cells in a PWM specifier.

      - cell 0: PWM period in nanoseconds

      - cell 1: PWM polarity: 0 or PWM_POLARITY_INVERTED



required:

  - compatible

  - reg
@@ -50,9 +61,14 @@ examples: 
        #address-cells = <1>;

        #size-cells = <0>;



        fan@18 {

        fan_controller: fan@18 {

            compatible = "ti,amc6821";

            reg = <0x18>;

            #pwm-cells = <2>;



            fan {

                pwms = <&fan_controller 40000 0>;

            };

        };

    };

Documentation/devicetree/bindings/hwmon/ti,ina2xx.yaml

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ description: | 
properties:

  compatible:

    enum:

      - silergy,sq52206

      - silergy,sy24655

      - ti,ina209

      - ti,ina219
@@ -58,6 +59,9 @@ properties: 
      shunt voltage, and a value of 4 maps to ADCRANGE=0 such that a wider

      voltage range is used.



      For SQ52206,the shunt-gain value 1 mapps to ADCRANGE=10/11, the value 2

      mapps to ADCRANGE=01, and the value 4 mapps to ADCRANGE=00.



      The default value is device dependent, and is defined by the reset value

      of PGA/ADCRANGE in the respective configuration registers.

    $ref: /schemas/types.yaml#/definitions/uint32
@@ -97,6 +101,7 @@ allOf: 
        compatible:

          contains:

            enum:

              - silergy,sq52206

              - silergy,sy24655

              - ti,ina209

              - ti,ina219