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

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

Pull hwmon updates from Guenter Roeck:
 "New drivers:

   - Texas Instruments TMP464 and TMP468 driver

   - Vicor PLI1209BC Digital Supervisor driver

   - ASUS EC driver

  Improvements to existing drivers:

   - adt7x10:
       - Convert to use regmap
       - convert to use with_info API
       - use hwmon_notify_event
       - other cleanup

   - aquacomputer_d5next:
       - Add support for Aquacomputer Farbwerk 360

   - asus_wmi_sensors:
       - Add ASUS ROG STRIX B450-F GAMING II

   - asus_wmi_ec_sensors:
       - Support T_Sensor on Prime X570-Pro
       - Deprecate driver (replaced by new driver)

   - axi-fan-control:
       - Use hwmon_notify_event

   - dell-smm:
       - Clean up CONFIG_I8K
       - disable fan type support for Inspiron 3505
       - various other cleanup

   - hwmon core:
       - Report attribute name with udev events
       - Add "label" attribute to ABI,
       - Add support for pwm auto channels attribute

   - max6639:
       - Add regulator support

   - lm70:
       - Add support for TI TMP125

   - lm83:
       - Cleanup, convert to use with_info API

   - mlxreg-fan:
       - Use pwm attribute for setting fan speed low limit

   - nct6775:
       - Add board ID's for ASUS ROG STRIX Z390/Z490/X570-* / PRIME
         X570-P, PRIME B550-PLUS, ASUS Pro B550M-C/PRIME B550M-A
       - Add support for TSI temperature registers

   - occ:
       - Add various new sysfs attributes

   - pmbus core:
       - Handle VIN unit off status
       - Add regulator supply into macro
       - Add get_error_flags support to regulator ops

   - pmbus/adm1275:
       - Allow setting sample averaging

   - pmbus/lm25066:
       - Add regulator support

   - pmbus/xdpe12284:
       - Add support for xdpe11280
       - register as regulator

   - powr1220:
       - Convert to with_info API
       - Add support for Lattice's POWR1014 power manager IC

   - sch56xx:
       - Cleanup and minor improvements

   - sch5627:
       - Add pwmX_auto_channels_temp support

   - tc654:
       - Add thermal_cooling device support"

* tag 'hwmon-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (86 commits)
  hwmon: (dell-smm) Add Inspiron 3505 to fan type blacklist
  hwmon: (pmbus) Add Vin unit off handling
  hwmon: (scpi-hwmon): Use of_device_get_match_data()
  hwmon: (axi-fan-control) Use hwmon_notify_event
  hwmon: (vexpress-hwmon) Use of_device_get_match_data()
  hwmon: Add driver for Texas Instruments TMP464 and TMP468
  dt-bindings: hwmon: add tmp464.yaml
  dt-bindings: hwmon: Add sample averaging properties for ADM1275
  hwmon: (adm1275) Allow setting sample averaging
  hwmon: (xdpe12284) Add regulator support
  hwmon: (xdpe12284) Add support for xdpe11280
  dt-bindings: trivial-devices: Add xdpe11280
  hwmon: (aquacomputer_d5next) Add support for Aquacomputer Farbwerk 360
  hwmon: (sch5627) Add pwmX_auto_channels_temp support
  hwmon: (core) Add support for pwm auto channels attribute
  hwmon: (lm70) Add ti,tmp125 support
  dt-bindings: Add ti,tmp125 temperature sensor binding
  hwmon: (pmbus/pli1209bc) Add regulator support
  hwmon: (pmbus) Add support for pli1209bc
  dt-bindings:trivial-devices: Add pli1209bc
  ...
parents d347ee54 6ba463ed

Documentation/ABI/obsolete/procfs-i8k

0 → 100644
+10 −0
Original line number Diff line number Diff line 
What:		/proc/i8k

Date:		November 2001

KernelVersion:	2.4.14

Contact:	Pali Rohár <pali@kernel.org>

Description:	Legacy interface for getting/setting sensor information like

		fan speed, temperature, serial number, hotkey status etc

		on Dell Laptops.

		Since the driver is now using the standard hwmon sysfs interface,

		the procfs interface is deprecated.

Users:		https://github.com/vitorafsr/i8kutils

Documentation/ABI/testing/sysfs-class-hwmon

+8 −0
Original line number Diff line number Diff line
@@ -9,6 +9,14 @@ Description: 


		RO



What:		/sys/class/hwmon/hwmonX/label

Description:

		A descriptive label that allows to uniquely identify a

		device within the system.

		The contents of the label are free-form.



		RO



What:		/sys/class/hwmon/hwmonX/update_interval

Description:

		The interval at which the chip will update readings.

Documentation/admin-guide/kernel-parameters.txt

+24 −11
Original line number Diff line number Diff line
@@ -944,6 +944,30 @@ 
			dump out devices still on the deferred probe list after

			retrying.



	dell_smm_hwmon.ignore_dmi=

			[HW] Continue probing hardware even if DMI data

			indicates that the driver is running on unsupported

			hardware.



	dell_smm_hwmon.force=

			[HW] Activate driver even if SMM BIOS signature does

			not match list of supported models and enable otherwise

			blacklisted features.



	dell_smm_hwmon.power_status=

			[HW] Report power status in /proc/i8k

			(disabled by default).



	dell_smm_hwmon.restricted=

			[HW] Allow controlling fans only if SYS_ADMIN

			capability is set.



	dell_smm_hwmon.fan_mult=

			[HW] Factor to multiply fan speed with.



	dell_smm_hwmon.fan_max=

			[HW] Maximum configurable fan speed.



	dfltcc=		[HW,S390]

			Format: { on | off | def_only | inf_only | always }

			on:       s390 zlib hardware support for compression on
@@ -1703,17 +1727,6 @@ 


	i810=		[HW,DRM]



	i8k.ignore_dmi	[HW] Continue probing hardware even if DMI data

			indicates that the driver is running on unsupported

			hardware.

	i8k.force	[HW] Activate i8k driver even if SMM BIOS signature

			does not match list of supported models.

	i8k.power_status

			[HW] Report power status in /proc/i8k

			(disabled by default)

	i8k.restricted	[HW] Allow controlling fans only if SYS_ADMIN

			capability is set.



	i915.invert_brightness=

			[DRM] Invert the sense of the variable that is used to

			set the brightness of the panel backlight. Normally a

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

+68 −0
Original line number Diff line number Diff line
@@ -37,6 +37,72 @@ properties: 
    description:

      Shunt resistor value in micro-Ohm.



  adi,volt-curr-sample-average:

    description: |

      Number of samples to be used to report voltage and current values.

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

    enum: [1, 2, 4, 8, 16, 32, 64, 128]



  adi,power-sample-average:

    description: |

      Number of samples to be used to report power values.

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

    enum: [1, 2, 4, 8, 16, 32, 64, 128]



allOf:

  - if:

      properties:

        compatible:

          contains:

            enum:

              - adi,adm1075

              - adi,adm1276

    then:

      properties:

        adi,volt-curr-sample-average:

          default: 128

        adi,power-sample-average: false



  - if:

      properties:

        compatible:

          contains:

            enum:

              - adi,adm1275

    then:

      properties:

        adi,volt-curr-sample-average:

          default: 16

        adi,power-sample-average: false



  - if:

      properties:

        compatible:

          contains:

            enum:

              - adi,adm1272

    then:

      properties:

        adi,volt-curr-sample-average:

          default: 128

        adi,power-sample-average:

          default: 128



  - if:

      properties:

        compatible:

          contains:

            enum:

              - adi,adm1278

              - adi,adm1293

              - adi,adm1294

    then:

      properties:

        adi,volt-curr-sample-average:

          default: 128

        adi,power-sample-average:

          default: 1



required:

  - compatible

  - reg
@@ -53,5 +119,7 @@ examples: 
            compatible = "adi,adm1272";

            reg = <0x10>;

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

            adi,volt-curr-sample-average = <128>;

            adi,power-sample-average = <128>;

        };

    };

Documentation/devicetree/bindings/hwmon/national,lm90.yaml

+1 −3
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ additionalProperties: false 


examples:

  - |

    #include <dt-bindings/gpio/tegra-gpio.h>

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



    i2c {
@@ -71,8 +70,7 @@ examples: 
            compatible = "onnn,nct1008";

            reg = <0x4c>;

            vcc-supply = <&palmas_ldo6_reg>;

            interrupt-parent = <&gpio>;

            interrupts = <TEGRA_GPIO(O, 4) IRQ_TYPE_LEVEL_LOW>;

            interrupts = <4 IRQ_TYPE_LEVEL_LOW>;

            #thermal-sensor-cells = <1>;

        };

    };