Commit 02892f90 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull hwmon updates from Guenter Roeck:
 "New drivers:
   - Apple Silicon SMC
   - TSC1641 I2C power monitor
   - MPS MP9945
   - MAX17616
   - MP2925 and MP2929

  Added support for new devices to existing drivers:
   - dell-smm: Add Dell G5 5505 to fan control whitelist
   - aspeed-g6-pwm-tach: Support for AST2700
   - asus-ec-sensors: Support for ROG STRIX X470-I GAMING, ROG STRIX
     X870-F GAMING WIFI, ROG STRIX X870E-H GAMING WIFI7, and Pro WS
     TRX50-SAGE WIFI
   - k10temp: Support for AMD Steam Deck APU ID
   - pmbus/isl68137: Support for raa229141
   - aht10: Support for dht20
   - adt7410: Support for ADT7422
   - peci: Support for Intel Emerald Rapids
   - nct6775: Support for ASUS ROG STRIX X870E-H GAMING WIFI7
   - pmbus/max34440: Support for ADPM12200
   - ntc-thermistor: Support for Murata ncp18wm474

  Infrastructure updates:
   - Utilize subsystem locking in various drivers
   - ltc4282, ltc2947: Use the new energy64 attribute

  Bug fixes:
   - Various drivers: Fixes to avoid TOCTOU, mostly in macro functions
     evaluating parameters multiple times, as well as missing locks
   - max6697: Fix regmap leak on probe failure
   - sy7636a: Fix regulator_enable resource leak on error path
   - asus-ec-sensors: Correct Pro WS TRX50-SAGE WIFI entry

  Other changes and improvements:
   - w83781d, lm78: Drop REALLY_SLOW_IO
   - Fix broken datasheet links in various drivers

  And various other minor fixes and improvements"

* tag 'hwmon-for-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (110 commits)
  hwmon: (dell-smm) Add Dell G5 5505 to fan control whitelist
  hwmon: (max16065) Use local variable to avoid TOCTOU
  hwmon: (w83l786ng) Convert macros to functions to avoid TOCTOU
  hwmon: (max6697) fix regmap leak on probe failure
  hwmon/w83781d: Drop REALLY_SLOW_IO setting
  hwmon/lm78: Drop REALLY_SLOW_IO setting
  hwmon: sy7636a: Fix regulator_enable resource leak on error path
  hwmon: (adm1026) Convert macros to functions to avoid TOCTOU
  hwmon: (adm1029) Add locking to avoid TOCTOU
  hwmon: (lm87) Convert macros to functions to avoid TOCTOU
  hwmon: (asus-ec-sensors) correct Pro WS TRX50-SAGE WIFI entry
  hwmon: (vt8231) Convert macros to functions to avoid TOCTOU
  hwmon: (emc2103) Add locking to avoid TOCTOU
  hwmon: (aspeed-g6-pwm-tach): Add AST2700 compatible string
  dt-bindings: hwmon: Add AST2700 compatible
  hwmon: (asus-ec-sensors) add ROG STRIX X470-I GAMING
  hwmon: (vt1211) Convert macros to functions to avoid TOCTOU
  hwmon: (k10temp) Add AMD Steam Deck APU ID
  hwmon: Add Apple Silicon SMC hwmon driver
  Documentation/hwmon: Fix broken datasheet links for zl6100
  ...
parents fca5327e 30ca0e04

Documentation/devicetree/bindings/hwmon/apm,xgene-slimpro-hwmon.yaml

0 → 100644
+30 −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/apm,xgene-slimpro-hwmon.yaml#

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



title: APM X-Gene SLIMpro hwmon



maintainers:

  - Khuong Dinh <khuong@os.amperecomputing.com>



properties:

  compatible:

    const: apm,xgene-slimpro-hwmon



  mboxes:

    maxItems: 1



required:

  - compatible

  - mboxes



additionalProperties: false



examples:

  - |

    hwmon {

        compatible = "apm,xgene-slimpro-hwmon";

        mboxes = <&mailbox 7>;

    };

Documentation/devicetree/bindings/hwmon/apm-xgene-hwmon.txt

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
APM X-Gene hwmon driver



APM X-Gene SOC sensors are accessed over the "SLIMpro" mailbox.



Required properties :

 - compatible : should be "apm,xgene-slimpro-hwmon"

 - mboxes : use the label reference for the mailbox as the first parameter.

	    The second parameter is the channel number.



Example :

	hwmonslimpro {

		compatible = "apm,xgene-slimpro-hwmon";

		mboxes = <&mailbox 7>;

	};

Documentation/devicetree/bindings/hwmon/aspeed,g6-pwm-tach.yaml

+5 −2
Original line number Diff line number Diff line
@@ -18,8 +18,11 @@ description: | 


properties:

  compatible:

    enum:

      - aspeed,ast2600-pwm-tach

    oneOf:

      - items:

          - const: aspeed,ast2700-pwm-tach

          - const: aspeed,ast2600-pwm-tach

      - const: aspeed,ast2600-pwm-tach



  reg:

    maxItems: 1

Documentation/devicetree/bindings/hwmon/max31785.txt

deleted100644 → 0
+0 −22
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/hwmon/maxim,max31790.yaml

+18 −4
Original line number Diff line number Diff line
@@ -20,7 +20,11 @@ description: > 


properties:

  compatible:

    const: maxim,max31790

    enum:

      - maxim,max31785

      - maxim,max31785a

      - maxim,max31785b

      - maxim,max31790



  reg:

    maxItems: 1
@@ -31,11 +35,17 @@ properties: 
  resets:

    maxItems: 1



  '#address-cells':

    const: 1



  '#size-cells':

    const: 0



  "#pwm-cells":

    const: 1



patternProperties:

  "^fan-[0-9]+$":

  "^fan@[0-9]+$":

    $ref: fan-common.yaml#

    unevaluatedProperties: false
@@ -56,13 +66,17 @@ examples: 
        reg = <0x20>;

        clocks = <&sys_clk>;

        resets = <&reset 0>;

        #address-cells = <1>;

        #pwm-cells = <1>;

        #size-cells = <0>;



        fan-0 {

        fan@0 {

          reg = <0x0>;

          pwms = <&pwm_provider 1>;

        };



        fan-1 {

        fan@1 {

          reg = <0x1>;

          pwms = <&pwm_provider 2>;

        };

      };