Commit 35417d57 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull hwmon updates from Guenter Roeck:
 "core:
   - Add support for enable attributes to hwmon core
   - Add intrusion templates

  pmbus:
   - Support for Infineon Multi-phase xdpe122 family controllers
   - Support for Intel IMVP9 and AMD 6.25mV modes
   - Support for vid mode detection per page bases
   - Detect if chip is write protected
   - Support for MAX20730, MAX20734, MAX20743, MAX20796, UCD90320,
     TPS53688
   - Various improvements to ibm-cffps driver

  k10temp:
   - Support for additional temperature sensors as well as voltage and
     current telemetry for Zen CPUs

  w83627ehf:
   - Remove support for NCT6775, NCT6776 (they have their own driver)

  New drivers:
   - ADM1177
   - MAX31730
   - Driver for disk and solid state drives with temperature sensors

  Other:
   - pwm-fan: stop fan on shutdown"

* tag 'hwmon-for-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (35 commits)
  hwmon: (k10temp) Display up to eight sets of CCD temperatures
  hwmon: (k10temp) Add debugfs support
  hwmon: (k10temp) Don't show temperature limits on Ryzen (Zen) CPUs
  hwmon: (k10temp) Show core and SoC current and voltages on Ryzen CPUs
  hwmon: (k10temp) Report temperatures per CPU die
  hmon: (k10temp) Convert to use devm_hwmon_device_register_with_info
  hwmon: (k10temp) Use bitops
  hwmon: (pwm-fan) stop fan on shutdown
  MAINTAINERS: add entry for ADM1177 driver
  dt-binding: hwmon: Add documentation for ADM1177
  hwmon: (adm1177) Add ADM1177 Hot Swap Controller and Digital Power Monitor driver
  docs: hwmon: Include 'xdpe12284.rst' into docs
  hwmon: (pmbus) Add support for Infineon Multi-phase xdpe122 family controllers
  hwmon: (pmbus/tps53679) Extend device list supported by driver
  hwmon: (pmbus/core) Add support for Intel IMVP9 and AMD 6.25mV modes
  hwmon: (pmbus/core) Add support for vid mode detection per page bases
  hwmon: (pmbus/ibm-cffps) Prevent writing on_off_config with bad data
  hwmon: (w83627ehf) Remove set but not used variable 'fan4min'
  hwmon: Driver for disk and solid state drives with temperature sensors
  hwmon: (pmbus/ibm-cffps) Fix the LED behavior when turned off
  ...
parents 189fc98e fd8bdb23

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

0 → 100644
+66 −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/adi,adm1177.yaml#

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



title: Analog Devices ADM1177 Hot Swap Controller and Digital Power Monitor



maintainers:

  - Michael Hennerich <michael.hennerich@analog.com>

  - Beniamin Bia <beniamin.bia@analog.com>



description: |

  Analog Devices ADM1177 Hot Swap Controller and Digital Power Monitor

  https://www.analog.com/media/en/technical-documentation/data-sheets/ADM1177.pdf



properties:

  compatible:

    enum:

      - adi,adm1177



  reg:

    maxItems: 1



  avcc-supply:

    description:

      Phandle to the Avcc power supply



  shunt-resistor-micro-ohms:

    description:

      The value of curent sense resistor in microohms. If not provided,

      the current reading and overcurrent alert is disabled.



  adi,shutdown-threshold-microamp:

    description:

      Specifies the current level at which an over current alert occurs.

      If not provided, the overcurrent alert is configured to max ADC range

      based on shunt-resistor-micro-ohms.



  adi,vrange-high-enable:

    description:

      Specifies which internal voltage divider to be used. A 1 selects

      a 7:2 voltage divider while a 0 selects a 14:1 voltage divider.

    type: boolean



required:

  - compatible

  - reg



examples:

  - |

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

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

    i2c0 {

        #address-cells = <1>;

        #size-cells = <0>;



        pwmon@5a {

                compatible = "adi,adm1177";

                reg = <0x5a>;

                shunt-resistor-micro-ohms = <50000>; /* 50 mOhm */

                adi,shutdown-threshold-microamp = <1059000>; /* 1.059 A */

                adi,vrange-high-enable;

        };

    };

...

Documentation/devicetree/bindings/hwmon/pmbus/ti,ucd90320.yaml

0 → 100644
+45 −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/pmbus/ti,ucd90320.yaml#

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



title: UCD90320 power sequencer



maintainers:

  - Jim Wright <wrightj@linux.vnet.ibm.com>



description: |

  The UCD90320 is a 32-rail PMBus/I2C addressable power-supply sequencer and

  monitor. The 24 integrated ADC channels (AMONx) monitor the power supply

  voltage, current, and temperature. Of the 84 GPIO pins, 8 can be used as

  digital monitors (DMONx), 32 to enable the power supply (ENx), 24 for

  margining (MARx), 16 for logical GPO, and 32 GPIs for cascading, and system

  function.



  http://focus.ti.com/lit/ds/symlink/ucd90320.pdf



properties:

  compatible:

    enum:

      - ti,ucd90320



  reg:

    maxItems: 1



required:

  - compatible

  - reg



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        ucd90320@11 {

            compatible = "ti,ucd90320";

            reg = <0x11>;

        };

    };

Documentation/hwmon/adm1177.rst

0 → 100644
+36 −0
Original line number Diff line number Diff line 
Kernel driver adm1177

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



Supported chips:

  * Analog Devices ADM1177

    Prefix: 'adm1177'

    Datasheet: https://www.analog.com/media/en/technical-documentation/data-sheets/ADM1177.pdf



Author: Beniamin Bia <beniamin.bia@analog.com>





Description

-----------



This driver supports hardware monitoring for Analog Devices ADM1177

Hot-Swap Controller and Digital Power Monitors with Soft Start Pin.





Usage Notes

-----------



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

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

details.





Sysfs entries

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



The following attributes are supported. Current maxim attribute

is read-write, all other attributes are read-only.



in0_input		Measured voltage in microvolts.



curr1_input		Measured current in microamperes.

curr1_max_alarm		Overcurrent alarm in microamperes.

Documentation/hwmon/drivetemp.rst

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



Kernel driver drivetemp

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





References

----------



ANS T13/1699-D

Information technology - AT Attachment 8 - ATA/ATAPI Command Set (ATA8-ACS)



ANS Project T10/BSR INCITS 513

Information technology - SCSI Primary Commands - 4 (SPC-4)



ANS Project INCITS 557

Information technology - SCSI / ATA Translation - 5 (SAT-5)





Description

-----------



This driver supports reporting the temperature of disk and solid state

drives with temperature sensors.



If supported, it uses the ATA SCT Command Transport feature to read

the current drive temperature and, if available, temperature limits

as well as historic minimum and maximum temperatures. If SCT Command

Transport is not supported, the driver uses SMART attributes to read

the drive temperature.





Sysfs entries

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



Only the temp1_input attribute is always available. Other attributes are

available only if reported by the drive. All temperatures are reported in

milli-degrees Celsius.



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

temp1_input		Current drive temperature

temp1_lcrit		Minimum temperature limit. Operating the device below

			this temperature may cause physical damage to the

			device.

temp1_min		Minimum recommended continuous operating limit

temp1_max		Maximum recommended continuous operating temperature

temp1_crit		Maximum temperature limit. Operating the device above

			this temperature may cause physical damage to the

			device.

temp1_lowest		Minimum temperature seen this power cycle

temp1_highest		Maximum temperature seen this power cycle

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

Documentation/hwmon/index.rst

+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ Hardware Monitoring Kernel Drivers 
   adm1025

   adm1026

   adm1031

   adm1177

   adm1275

   adm9240

   ads7828
@@ -47,6 +48,7 @@ Hardware Monitoring Kernel Drivers 
   da9055

   dell-smm-hwmon

   dme1737

   drivetemp

   ds1621

   ds620

   emc1403
@@ -106,8 +108,10 @@ Hardware Monitoring Kernel Drivers 
   max1619

   max1668

   max197

   max20730

   max20751

   max31722

   max31730

   max31785

   max31790

   max34440
@@ -177,6 +181,7 @@ Hardware Monitoring Kernel Drivers 
   wm831x

   wm8350

   xgene-hwmon

   xdpe12284

   zl6100



.. only::  subproject and html

CRA Git | Maintained and supported by SUSTech CRA and CCSE