Commit 4173cf6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull hwmon updates from Guenter Roeck:
 "New drivers

   - Driver for Acbel FSB032 power supply

   - Driver for StarFive JH71x0 temperature sensor

  Added support to existing drivers:

   - aquacomputer_d5next: Support for Aquacomputer Aquastream XT

   - nct6775: Added various ASUS boards to list of boards supporting WMI

   - asus-ec-sensors: ROG STRIX Z390-F GAMING, ProArt B550-Creator,

  Notable improvements:

   - Regulator event and sysfs notification support for PMBus drivers

  Notable cleanup:

   - Constified pointers to hwmon_channel_info

  .. and various other minor bug fixes and improvements"

* tag 'hwmon-for-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (131 commits)
  hwmon: lochnagar: Remove the unneeded include <linux/i2c.h>
  hwmon: (pmbus/fsp-3y) Fix functionality bitmask in FSP-3Y YM-2151E
  hwmon: (adt7475) Use device_property APIs when configuring polarity
  hwmon: (aquacomputer_d5next) Add support for Aquacomputer Aquastream XT
  hwmon: (it87) Disable/enable SMBus access for IT8622E chipset
  hwmon: (it87) Add calls to smbus_enable/smbus_disable as required
  hwmon: (it87) Test for error in it87_update_device
  hwmon: (it87) Disable SMBus access for environmental controller registers.
  docs: hwmon: Add documentaion for acbel-fsg032 PSU
  hwmon: (pmbus/acbel-fsg032) Add Acbel power supply
  dt-bindings: trivial-devices: Add acbel,fsg032
  dt-bindings: vendor-prefixes: Add prefix for acbel
  hwmon: (sfctemp) Simplify error message
  hwmon: (pmbus/ibm-cffps) Use default debugfs attributes and lock function
  hwmon: (pmbus/core) Add lock and unlock functions
  hwmon: (pmbus/core) Request threaded interrupt with IRQF_ONESHOT
  hwmon: (nct6775) update ASUS WMI monitoring list A620/B760/W790
  hwmon: ina2xx: add optional regulator support
  dt-bindings: hwmon: ina2xx: add supply property
  dt-bindings: hwmon: pwm-fan: Convert to DT schema
  ...
parents 3361e9a4 1c19ac76

Documentation/devicetree/bindings/hwmon/pwm-fan.txt

+1 −67
Original line number Diff line number Diff line 
Bindings for a fan connected to the PWM lines



Required properties:

- compatible	: "pwm-fan"

- pwms		: the PWM that is used to control the PWM fan

- cooling-levels      : PWM duty cycle values in a range from 0 to 255

			which correspond to thermal cooling states



Optional properties:

- fan-supply		: phandle to the regulator that provides power to the fan

- interrupts		: This contains an interrupt specifier for each fan

			  tachometer output connected to an interrupt source.

			  The output signal must generate a defined number of

			  interrupts per fan revolution, which require that

			  it must be self resetting edge interrupts. See

			  interrupt-controller/interrupts.txt for the format.

- pulses-per-revolution : define the number of pulses per fan revolution for

			  each tachometer input as an integer (default is 2

			  interrupts per revolution). The value must be

			  greater than zero.



Example:

	fan0: pwm-fan {

		compatible = "pwm-fan";

		#cooling-cells = <2>;

		pwms = <&pwm 0 10000 0>;

		cooling-levels = <0 102 170 230>;

	};



	thermal-zones {

		cpu_thermal: cpu-thermal {

			     thermal-sensors = <&tmu 0>;

			     polling-delay-passive = <0>;

			     polling-delay = <0>;

			     trips {

					cpu_alert1: cpu-alert1 {

						    temperature = <100000>; /* millicelsius */

						    hysteresis = <2000>; /* millicelsius */

						    type = "passive";

					};

			     };

			     cooling-maps {

					map0 {

						    trip = <&cpu_alert1>;

						    cooling-device = <&fan0 0 1>;

					};

			     };

		};



Example 2:

	fan0: pwm-fan {

		compatible = "pwm-fan";

		pwms = <&pwm 0 40000 0>;

		fan-supply = <&reg_fan>;

		interrupt-parent = <&gpio5>;

		interrupts = <1 IRQ_TYPE_EDGE_FALLING>;

		pulses-per-revolution = <2>;

	};



Example 3:

	fan0: pwm-fan {

		compatible = "pwm-fan";

		pwms = <&pwm1 0 25000 0>;

		interrupts-extended = <&gpio1 1 IRQ_TYPE_EDGE_FALLING>,

			<&gpio2 5 IRQ_TYPE_EDGE_FALLING>;

		pulses-per-revolution = <2>, <1>;

	};
 
This file has moved to pwm-fan.yaml.

Documentation/devicetree/bindings/hwmon/pwm-fan.yaml

0 → 100644
+97 −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/pwm-fan.yaml#

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



title: Fan connected to PWM lines



maintainers:

  - Jean Delvare <jdelvare@suse.com>

  - Guenter Roeck <linux@roeck-us.net>



properties:

  compatible:

    const: pwm-fan



  cooling-levels:

    description: PWM duty cycle values corresponding to thermal cooling states.

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

    items:

      maximum: 255



  fan-supply:

    description: Phandle to the regulator that provides power to the fan.



  interrupts:

    description:

      This contains an interrupt specifier for each fan tachometer output

      connected to an interrupt source. The output signal must generate a

      defined number of interrupts per fan revolution, which require that

      it must be self resetting edge interrupts.

    maxItems: 1



  pulses-per-revolution:

    description:

      Define the number of pulses per fan revolution for each tachometer

      input as an integer.

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

    minimum: 1

    maximum: 4

    default: 2



  pwms:

    description: The PWM that is used to control the fan.

    maxItems: 1



  "#cooling-cells": true



required:

  - compatible

  - pwms



additionalProperties: false



examples:

  - |

    pwm-fan {

      compatible = "pwm-fan";

      cooling-levels = <0 102 170 230>;

      pwms = <&pwm 0 10000 0>;

      #cooling-cells = <2>;

    };



    thermal-zones {

      cpu_thermal: cpu-thermal {

        thermal-sensors = <&tmu 0>;

        polling-delay-passive = <0>;

        polling-delay = <0>;



        trips {

          cpu_alert1: cpu-alert1 {

            temperature = <100000>; /* millicelsius */

            hysteresis = <2000>; /* millicelsius */

            type = "passive";

          };

        };



        cooling-maps {

          map0 {

            trip = <&cpu_alert1>;

            cooling-device = <&fan0 0 1>;

          };

        };

      };

    };



  - |

    #include <dt-bindings/interrupt-controller/irq.h>



    pwm-fan {

      compatible = "pwm-fan";

      pwms = <&pwm 0 40000 0>;

      fan-supply = <&reg_fan>;

      interrupt-parent = <&gpio5>;

      interrupts = <1 IRQ_TYPE_EDGE_FALLING>;

      pulses-per-revolution = <2>;

    };

Documentation/devicetree/bindings/hwmon/starfive,jh71x0-temp.yaml

0 → 100644
+70 −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/starfive,jh71x0-temp.yaml#

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



title: StarFive JH71x0 Temperature Sensor



maintainers:

  - Emil Renner Berthing <kernel@esmil.dk>



description: |

  StarFive Technology Co. JH71x0 embedded temperature sensor



properties:

  compatible:

    enum:

      - starfive,jh7100-temp

      - starfive,jh7110-temp



  reg:

    maxItems: 1



  clocks:

    minItems: 2

    maxItems: 2



  clock-names:

    items:

      - const: "sense"

      - const: "bus"



  '#thermal-sensor-cells':

    const: 0



  resets:

    minItems: 2

    maxItems: 2



  reset-names:

    items:

      - const: "sense"

      - const: "bus"



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - resets

  - reset-names



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/starfive-jh7100.h>

    #include <dt-bindings/reset/starfive-jh7100.h>



    temperature-sensor@124a0000 {

        compatible = "starfive,jh7100-temp";

        reg = <0x124a0000 0x10000>;

        clocks = <&clkgen JH7100_CLK_TEMP_SENSE>,

                 <&clkgen JH7100_CLK_TEMP_APB>;

        clock-names = "sense", "bus";

        #thermal-sensor-cells = <0>;

        resets = <&rstgen JH7100_RSTN_TEMP_SENSE>,

                 <&rstgen JH7100_RSTN_TEMP_APB>;

        reset-names = "sense", "bus";

    };

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

+5 −0
Original line number Diff line number Diff line
@@ -57,6 +57,10 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/uint32

    enum: [1, 2, 4, 8]



  vs-supply:

    description: phandle to the regulator that provides the VS supply typically

      in range from 2.7 V to 5.5 V.



required:

  - compatible

  - reg
@@ -73,5 +77,6 @@ examples: 
            compatible = "ti,ina220";

            reg = <0x44>;

            shunt-resistor = <1000>;

            vs-supply = <&vdd_3v0>;

        };

    };

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

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: TMP464 and TMP468 temperature sensors



maintainers:

  - Agathe Porte <agathe.porte@nokia.com>

  - Guenter Roeck <linux@roeck-us.net>



description: |

  ±0.0625°C Remote and Local temperature sensor