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

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

Pull hwmon updates from Guenter Roeck:
 "Updated chip support in existing drivers:

   - ina238: Support for INA228

   - pmbus/tps53679: Support for TPS53685

   - pmbus/adp1050: Support for adp1051, adp1055 and ltp8800

   - corsair-psu: Support for HX1200i Series 2025

   - pmbus/isl68137: Support for RAA229621

   - asus-ec-sensors: Support for ProArt X870E-CREATOR WIFI and

  Other notable changes:

   - adt7475: Support for #pwm-cells = <3>

   - amc6821: Cooling device support

   - emc2305: Support for PWM frequency, polarity and output

   - Add missing compatible entries to various devicetree bindings

  And various other minor fixes and improvements"

* tag 'hwmon-for-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (34 commits)
  dt-bindings: hwmon: Replace bouncing Alexandru Tachici emails
  hwmon: (ina238) Add support for INA228
  dt-bindings: Add INA228 to ina2xx devicetree bindings
  hwmon: (ina238) Fix inconsistent whitespace
  dt-bindings: hwmon: adt7475: Allow and recommend #pwm-cells = <3>
  hwmon: (adt7475) Implement support for #pwm-cells = <3>
  hwmon: (pmbus/tps53679) Add support for TPS53685
  dt-bindings: trivial: Add tps53685 support
  hwmon: (pmbus/adp1050) Add regulator support for ltp8800
  hwmon: (pmbus/adp1050) Add support for adp1051, adp1055 and ltp8800
  dt-bindings: hwmon: pmbus/adp1050: Add adp1051, adp1055 and ltp8800
  hwmon: (max31827) use sysfs_emit() in temp1_resolution_show()
  hwmon: (ltc4282) convert from round_rate() to determine_rate()
  hwmon: (corsair-psu) add support for HX1200i Series 2025
  dt-bindings: hwmon: pmbus: ti,ucd90320: Add missing compatibles
  dt-bindings: hwmon: maxim,max20730: Add maxim,max20710 compatible
  dt-bindings: hwmon: lltc,ltc2978: Add lltc,ltc713 compatible
  dt-bindings: hwmon: ti,lm87: Add adi,adm1024 compatible
  dt-bindings: hwmon: national,lm90: Add missing Dallas max6654 and onsemi nct72, nct214, and nct218
  hwmon: (w83627ehf) make the read-only arrays 'bit' static const
  ...
parents 602a0672 de1fffd8

Documentation/devicetree/bindings/hwmon/adi,adm1266.yaml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ title: Analog Devices ADM1266 Cascadable Super Sequencer with Margin 
  Control and Fault Recording



maintainers:

  - Alexandru Tachici <alexandru.tachici@analog.com>

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



description: |

  Analog Devices ADM1266 Cascadable Super Sequencer with Margin

Documentation/devicetree/bindings/hwmon/adi,ltc2992.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Linear Technology 2992 Power Monitor



maintainers:

  - Alexandru Tachici <alexandru.tachici@analog.com>

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



description: |

  Linear Technology 2992 Dual Wide Range Power Monitor

Documentation/devicetree/bindings/hwmon/adt7475.yaml

+9 −6
Original line number Diff line number Diff line
@@ -53,7 +53,10 @@ properties: 
      default: 1



  "#pwm-cells":

    const: 4

    oneOf:

      - const: 3

      - const: 4

        deprecated: true

    description: |

      Number of cells in a PWM specifier.

      - 0: The PWM channel
@@ -68,7 +71,7 @@ properties: 
           - 11363636 (88 Hz)

           - 44444 (22 kHz)

      - 2: PWM flags 0 or PWM_POLARITY_INVERTED

      - 3: The default PWM duty cycle in nanoseconds

      - 3: The default PWM duty cycle in nanoseconds, defaults to period.



patternProperties:

  "^adi,bypass-attenuator-in[0-4]$":
@@ -124,15 +127,15 @@ examples: 
        adi,bypass-attenuator-in1 = <0>;

        adi,pin10-function = "smbalert#";

        adi,pin14-function = "tach4";

        #pwm-cells = <4>;

        #pwm-cells = <3>;



        /* PWMs at 22.5 kHz frequency, 50% duty*/

        /* PWMs at 22.5 kHz frequency */

        fan-0 {

          pwms = <&pwm 0 44444 0 22222>;

          pwms = <&pwm 0 44444 0>;

        };



        fan-1 {

          pwms = <&pwm 2 44444 0 22222>;

          pwms = <&pwm 2 44444 0>;

        };

      };

    };

Documentation/devicetree/bindings/hwmon/lltc,ltc2978.yaml

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ properties: 
      - lltc,ltc3886

      - lltc,ltc3887

      - lltc,ltc3889

      - lltc,ltc7132

      - lltc,ltc7841

      - lltc,ltc7880

      - lltc,ltm2987
@@ -55,6 +56,7 @@ properties: 
      * ltc2977, ltc2979, ltc2980, ltm2987 : vout0 - vout7

      * ltc2978 : vout0 - vout7

      * ltc3880, ltc3882, ltc3884, ltc3886, ltc3887, ltc3889 : vout0 - vout1

      * ltc7132 : vout0 - vout1

      * ltc7841 : vout0

      * ltc7880 : vout0 - vout1

      * ltc3883 : vout0

Documentation/devicetree/bindings/hwmon/maxim,max20730.yaml

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

  compatible:

    enum:

      - maxim,max20710

      - maxim,max20730

      - maxim,max20734

      - maxim,max20743