Commit 5dfec3cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull hwmon updates from Guenter Roeck:
 "New drivers:
   - pmbus: Support for MPS Multi-phase mp2856/mp2857 controller
   - pmbus: Support for MPS Multi-phase mp5990
   - Driver for Gigabyte AORUS Waterforce AIO coolers

  Added support to existing drivers:
   - lm75: Support for AMS AS6200 temperature sensor
   - k10temp: Support for AMD Family 19h Model 8h
   - max31827: Support for max31828 and max31829
   - sht3x: Support for sts3x
   - Add support for WMI SMM interface, and various related improvements.
    Add support for Optiplex 7000
   - emc1403: Support for EMC1442
   - npcm750-pwm-fan: Support for NPCM8xx
   - nct6775: Add support for 2 additional fan controls

  Minor improvements and bug fixes:
   - gigabyte_waterforce: Mark status report as received under a spinlock
   - aquacomputer_d5next: Remove unneeded CONFIG_DEBUG_FS #ifdef
   - gpio-fan: Convert txt bindings to yaml
   - smsc47m1: Various cleanups / improvements
   - corsair-cpro: use NULL instead of 0
   - hp-wmi-sensors: Fix failure to load on EliteDesk 800 G6
   - tmp513: Various cleanups
   - peci/dimmtemp: Bump timeout
   - pc87360: Bounds check data->innr usage
   - nct6775: Fix fan speed set failure in automatic mode
   - ABI: sysfs-class-hwmon: document various missing attributes
   - lm25066, max6650, nct6775: Use i2c_get_match_data()
   - aspeed-pwm-tacho: Fix -Wstringop-overflow warning"

* tag 'hwmon-for-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (59 commits)
  hwmon: (gigabyte_waterforce) Mark status report as received under a spinlock
  hwmon: (lm75) Fix tmp112 default config
  hwmon: (lm75) Add AMS AS6200 temperature sensor
  dt-bindings: hwmon: (lm75) Add AMS AS6200 temperature sensor
  hwmon: (lm75) remove now-unused include
  hwmon: (pmbus) Add support for MPS Multi-phase mp2856/mp2857 controller
  dt-bindings: Add MP2856/MP2857 voltage regulator device
  hwmon: (aquacomputer_d5next) Remove unneeded CONFIG_DEBUG_FS #ifdef
  dt-bindings: hwmon: gpio-fan: Convert txt bindings to yaml
  hwmon: (k10temp) Add support for AMD Family 19h Model 8h
  hwmon: Add driver for Gigabyte AORUS Waterforce AIO coolers
  hwmon: (smsc47m1) Rename global platform device variable
  hwmon: (smsc47m1) Simplify device registration
  hwmon: (smsc47m1) Convert to platform remove callback returning void
  hwmon: (smsc47m1) Mark driver struct with __refdata to prevent section mismatch
  MAINTAINERS: Add maintainer for Baikal-T1 PVT hwmon driver
  hwmon: (sht3x) add sts3x support
  hwmon: (pmbus) Add ltc4286 driver
  dt-bindings: hwmon: Add lltc ltc4286 driver bindings
  hwmon: (max31827) Add custom attribute for resolution
  ...
parents 7912a639 41c71105

Documentation/ABI/testing/sysfs-class-hwmon

+100 −10
Original line number Diff line number Diff line
@@ -381,6 +381,15 @@ Description: 


		RW



What:		/sys/class/hwmon/hwmonX/tempY_max_alarm

Description:

		Maximum temperature alarm flag.



		- 0: OK

		- 1: temperature has reached tempY_max



		RO



What:		/sys/class/hwmon/hwmonX/tempY_min

Description:

		Temperature min value.
@@ -389,6 +398,15 @@ Description: 


		RW



What:		/sys/class/hwmon/hwmonX/tempY_min_alarm

Description:

		Minimum temperature alarm flag.



		- 0: OK

		- 1: temperature has reached tempY_min



		RO



What:		/sys/class/hwmon/hwmonX/tempY_max_hyst

Description:

		Temperature hysteresis value for max limit.
@@ -434,12 +452,7 @@ Description: 
		- 0: OK

		- 1: temperature has reached tempY_crit



		RW



		Contrary to regular alarm flags which clear themselves

		automatically when read, this one sticks until cleared by

		the user. This is done by writing 0 to the file. Writing

		other values is unsupported.

		RO



What:		/sys/class/hwmon/hwmonX/tempY_crit_hyst

Description:
@@ -462,6 +475,15 @@ Description: 


		RW



What:		/sys/class/hwmon/hwmonX/tempY_emergency_alarm

Description:

		Emergency high temperature alarm flag.



		- 0: OK

		- 1: temperature has reached tempY_emergency



		RO



What:		/sys/class/hwmon/hwmonX/tempY_emergency_hyst

Description:

		Temperature hysteresis value for emergency limit.
@@ -887,15 +909,15 @@ Description: 


		RW



What:		/sys/class/hwmon/hwmonX/humidityY_input

What:		/sys/class/hwmon/hwmonX/humidityY_alarm

Description:

		Humidity

		Humidity limit detection



		Unit: milli-percent (per cent mille, pcm)

		- 0: OK

		- 1: Humidity limit has been reached



		RO





What:		/sys/class/hwmon/hwmonX/humidityY_enable

Description:

		Enable or disable the sensors
@@ -908,6 +930,74 @@ Description: 


		RW



What:		/sys/class/hwmon/hwmonX/humidityY_fault

Description:

		Reports a humidity sensor failure.



		- 1: Failed

		- 0: Ok



		RO



What:		/sys/class/hwmon/hwmonX/humidityY_input

Description:

		Humidity



		Unit: milli-percent (per cent mille, pcm)



		RO



What:		/sys/class/hwmon/hwmonX/humidityY_label

Description:

		Suggested humidity channel label.



		Text string



		Should only be created if the driver has hints about what

		this humidity channel is being used for, and user-space

		doesn't. In all other cases, the label is provided by

		user-space.



		RO



What:		/sys/class/hwmon/hwmonX/humidityY_max

Description:

		Humidity max value.



		Unit: milli-percent (per cent mille, pcm)



		RW



What:		/sys/class/hwmon/hwmonX/humidityY_max_hyst

Description:

		Humidity hysteresis value for max limit.



		Unit: milli-percent (per cent mille, pcm)



		Must be reported as an absolute humidity, NOT a delta

		from the max value.



		RW



What:		/sys/class/hwmon/hwmonX/humidityY_min

Description:

		Humidity min value.



		Unit: milli-percent (per cent mille, pcm)



		RW



What:		/sys/class/hwmon/hwmonX/humidityY_min_hyst

Description:

		Humidity hysteresis value for min limit.



		Unit: milli-percent (per cent mille, pcm)



		Must be reported as an absolute humidity, NOT a delta

		from the min value.



		RW



What:		/sys/class/hwmon/hwmonX/humidityY_rated_min

Description:

		Minimum rated humidity.

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

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
Bindings for fan connected to GPIO lines



Required properties:

- compatible : "gpio-fan"



Optional properties:

- gpios: Specifies the pins that map to bits in the control value,

  ordered MSB-->LSB.

- gpio-fan,speed-map: A mapping of possible fan RPM speeds and the

  control value that should be set to achieve them. This array

  must have the RPM values in ascending order.

- alarm-gpios: This pin going active indicates something is wrong with

  the fan, and a udev event will be fired.

- #cooling-cells: If used as a cooling device, must be <2>

  Also see:

  Documentation/devicetree/bindings/thermal/thermal-cooling-devices.yaml

  min and max states are derived from the speed-map of the fan.



Note: At least one the "gpios" or "alarm-gpios" properties must be set.



Examples:



	gpio_fan {

		compatible = "gpio-fan";

		gpios = <&gpio1 14 1

			 &gpio1 13 1>;

		gpio-fan,speed-map = <0    0

				      3000 1

				      6000 2>;

		alarm-gpios = <&gpio1 15 1>;

	};

	gpio_fan_cool: gpio_fan {

		compatible = "gpio-fan";

		gpios = <&gpio2 14 1

			 &gpio2 13 1>;

		gpio-fan,speed-map =	<0    0>,

					<3000 1>,

					<6000 2>;

		alarm-gpios = <&gpio2 15 1>;

		#cooling-cells = <2>; /* min followed by max */

	};

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

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

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



title: Fan connected to GPIO lines



maintainers:

  - Rob Herring <robh@kernel.org>



properties:

  compatible:

    const: gpio-fan



  gpios:

    description: |

      Specifies the pins that map to bits in the control value,

      ordered MSB-->LSB.

    minItems: 1

    maxItems: 7



  alarm-gpios:

    maxItems: 1



  gpio-fan,speed-map:

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

    minItems: 2

    maxItems: 127

    items:

      items:

        - description: fan speed in RPMs

        - description: control value

    description: |

      A mapping of possible fan RPM speeds and the

      control value that should be set to achieve them. This array

      must have the RPM values in ascending order.



  '#cooling-cells':

    const: 2



required:

  - compatible

  - gpios

  - gpio-fan,speed-map



additionalProperties: false



examples:

  - |

    gpio-fan {

      compatible = "gpio-fan";

      gpios = <&gpio2 14 1

               &gpio2 13 1>;

      gpio-fan,speed-map = <   0 0>,

                           <3000 1>,

                           <6000 2>;

      alarm-gpios = <&gpio2 15 1>;

      #cooling-cells = <2>; /* min followed by max */

    };

Documentation/devicetree/bindings/hwmon/iio-hwmon.yaml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ properties: 


  io-channels:

    minItems: 1

    maxItems: 8 # Should be enough

    maxItems: 51 # Should be enough

    description: >

      List of phandles to ADC channels to read the monitoring values

Documentation/devicetree/bindings/hwmon/lltc,ltc4286.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/lltc,ltc4286.yaml#

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



title: LTC4286 power monitors



maintainers:

  - Delphine CC Chiu <Delphine_CC_Chiu@Wiwynn.com>



properties:

  compatible:

    enum:

      - lltc,ltc4286

      - lltc,ltc4287



  reg:

    maxItems: 1



  adi,vrange-low-enable:

    description:

      This property is a bool parameter to represent the

      voltage range is 25.6 volts or 102.4 volts for this chip.

      The default is 102.4 volts.

    type: boolean



  shunt-resistor-micro-ohms:

    description:

      Resistor value micro-ohms.



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        power-monitor@40 {

            compatible = "lltc,ltc4286";

            reg = <0x40>;

            adi,vrange-low-enable;

            shunt-resistor-micro-ohms = <300>;

        };

    };