Commit 2a5c6184 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull hwmon updates from Guenter Roeck:
 "New drivers:

   - Delta DPS920AB

   - Flex PIM4006, PIM4328 and PIM4820

   - MPS MP2888

   - Sensirion SHT4X

  Added chip support to existing drivers:

   - Flex BMR310, BMR456, BMR457, BMR458, BMR480, BMR490, BMR491, and
     BMR492

   - TI TMP1075

   - Renesas ZLS1003, ZLS4009 and ZL8802

  Other:

   - Dropped explicit ACPI support for MAX31722 and LM70; the APIC IDs
     in those drivers do not exist.

   - Support set_trips() callback into thermal subsystem

   - Minor fixes and improvements in various drivers"

* tag 'hwmon-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (49 commits)
  hwmon: Support set_trips() of thermal device ops
  hwmon: (lm90) Prevent integer underflows of temperature calculations
  hwmon: (lm90) Disable interrupt on suspend
  hwmon: (lm90) Unmask hardware interrupt
  hwmon: (lm90) Use hwmon_notify_event()
  hwmon: (lm90) Don't override interrupt trigger type
  hwmon: (pmbus/dps920ab) Delete some dead code
  hwmon: (ntc_thermistor) Drop unused headers.
  MAINTAINERS: Add Delta DPS920AB PSU driver
  dt-bindings: trivial-devices: Add Delta DPS920AB
  hwmon: (pmbus) Add driver for Delta DPS-920AB PSU
  hwmon: (pmbus/pim4328) Add documentation for the pim4328 PMBus driver
  hwmon: (pmbus/pim4328) Add PMBus driver for PIM4006, PIM4328 and PIM4820
  hwmon: (pmbus) Allow phase function even if it's not on page
  hwmon: (pmbus) Add support for reading direct mode coefficients
  hwmon: (pmbus) Add new pmbus flag NO_WRITE_PROTECT
  docs: hwmon: adm1177.rst: avoid using ReSt :doc:`foo` markup
  hwmon: (pmbus_core) Check adapter PEC support
  hwmon: (ina3221) use CVRF only for single-shot conversion
  hwmon: (max31790) Detect and report zero fan speed
  ...
parents 69609a91 a5f6c0f8

Documentation/devicetree/bindings/hwmon/lm75.yaml

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ properties: 
      - st,stds75

      - st,stlm75

      - microchip,tcn75

      - ti,tmp1075

      - ti,tmp100

      - ti,tmp101

      - ti,tmp105

Documentation/devicetree/bindings/trivial-devices.yaml

+4 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ properties: 
          - dallas,ds4510

            # Digital Thermometer and Thermostat

          - dallas,ds75

          # Delta Electronics DPS920AB 920W 54V Power Supply

          - delta,dps920ab

            # 1/4 Brick DC/DC Regulated Power Module

          - delta,q54sj108a2

            # Devantech SRF02 ultrasonic ranger in I2C mode
@@ -103,6 +105,8 @@ properties: 
          - fsl,mpl3115

            # MPR121: Proximity Capacitive Touch Sensor Controller

          - fsl,mpr121

            # Monolithic Power Systems Inc. multi-phase controller mp2888

          - mps,mp2888

            # Monolithic Power Systems Inc. multi-phase controller mp2975

          - mps,mp2975

            # G751: Digital Temperature Sensor and Thermal Watchdog with Two-Wire Interface

Documentation/hwmon/adm1177.rst

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ Usage Notes 
-----------



This driver does not auto-detect devices. You will have to instantiate the

devices explicitly. Please see :doc:`/i2c/instantiating-devices` for details.

devices explicitly. Please see Documentation/i2c/instantiating-devices.rst

for details.





Sysfs entries

Documentation/hwmon/dps920ab.rst

0 → 100644
+73 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0-or-later



Kernel driver dps920ab

========================



Supported chips:



  * Delta DPS920AB



    Prefix: 'dps920ab'



    Addresses scanned: -



Authors:

    Robert Marko <robert.marko@sartura.hr>





Description

-----------



This driver implements support for Delta DPS920AB 920W 54V DC single output

power supply with PMBus support.



The driver is a client driver to the core PMBus driver.

Please see Documentation/hwmon/pmbus.rst for details on PMBus client drivers.





Usage Notes

-----------



This driver does not auto-detect devices. You will have to instantiate the

devices explicitly. Please see Documentation/i2c/instantiating-devices.rst for

details.





Sysfs entries

-------------



======================= ======================================================

curr1_label		"iin"

curr1_input		Measured input current

curr1_alarm		Input current high alarm



curr2_label		"iout1"

curr2_input		Measured output current

curr2_max		Maximum output current

curr2_rated_max		Maximum rated output current



in1_label		"vin"

in1_input		Measured input voltage

in1_alarm		Input voltage alarm



in2_label		"vout1"

in2_input		Measured output voltage

in2_rated_min		Minimum rated output voltage

in2_rated_max		Maximum rated output voltage

in2_alarm		Output voltage alarm



power1_label		"pin"

power1_input		Measured input power

power1_alarm		Input power high alarm



power2_label		"pout1"

power2_input		Measured output power

power2_rated_max	Maximum rated output power



temp[1-3]_input		Measured temperature

temp[1-3]_alarm		Temperature alarm



fan1_alarm		Fan 1 warning.

fan1_fault		Fan 1 fault.

fan1_input		Fan 1 speed in RPM.

======================= ======================================================

Documentation/hwmon/index.rst

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ Hardware Monitoring Kernel Drivers 
   da9055

   dell-smm-hwmon

   dme1737

   dps920ab

   drivetemp

   ds1621

   ds620
@@ -137,6 +138,7 @@ Hardware Monitoring Kernel Drivers 
   mcp3021

   menf21bmc

   mlxreg-fan

   mp2888

   mp2975

   nct6683

   nct6775
@@ -150,6 +152,7 @@ Hardware Monitoring Kernel Drivers 
   pc87360

   pc87427

   pcf8591

   pim4328

   pm6764tr

   pmbus

   powr1220
@@ -164,6 +167,7 @@ Hardware Monitoring Kernel Drivers 
   sht15

   sht21

   sht3x

   sht4x

   shtc1

   sis5595

   sl28cpld