diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 09:14:11 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 09:14:11 -0800 | 
| commit | 35417d57efaaf06894868a2e8dfcd7b9f31bd0bf (patch) | |
| tree | 8178ec19292ed8bae5e883e100afee4b463ef92a /Documentation | |
| parent | 189fc98efe59b9b0a49a4f29ee3d91eeded4e4d4 (diff) | |
| parent | fd8bdb23b91876ac1e624337bb88dc1dcc21d67e (diff) | |
| download | linux-35417d57efaaf06894868a2e8dfcd7b9f31bd0bf.tar.bz2 | |
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
  ...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/hwmon/adi,adm1177.yaml | 66 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/hwmon/pmbus/ti,ucd90320.yaml | 45 | ||||
| -rw-r--r-- | Documentation/hwmon/adm1177.rst | 36 | ||||
| -rw-r--r-- | Documentation/hwmon/drivetemp.rst | 52 | ||||
| -rw-r--r-- | Documentation/hwmon/index.rst | 5 | ||||
| -rw-r--r-- | Documentation/hwmon/max20730.rst | 74 | ||||
| -rw-r--r-- | Documentation/hwmon/max31730.rst | 44 | ||||
| -rw-r--r-- | Documentation/hwmon/pmbus.rst | 10 | ||||
| -rw-r--r-- | Documentation/hwmon/ucd9000.rst | 12 | ||||
| -rw-r--r-- | Documentation/hwmon/xdpe12284.rst | 101 | 
10 files changed, 443 insertions, 2 deletions
| diff --git a/Documentation/devicetree/bindings/hwmon/adi,adm1177.yaml b/Documentation/devicetree/bindings/hwmon/adi,adm1177.yaml new file mode 100644 index 000000000000..2a9822075b36 --- /dev/null +++ b/Documentation/devicetree/bindings/hwmon/adi,adm1177.yaml @@ -0,0 +1,66 @@ +# 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; +        }; +    }; +... diff --git a/Documentation/devicetree/bindings/hwmon/pmbus/ti,ucd90320.yaml b/Documentation/devicetree/bindings/hwmon/pmbus/ti,ucd90320.yaml new file mode 100644 index 000000000000..5d42e1304202 --- /dev/null +++ b/Documentation/devicetree/bindings/hwmon/pmbus/ti,ucd90320.yaml @@ -0,0 +1,45 @@ +# 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>; +        }; +    }; diff --git a/Documentation/hwmon/adm1177.rst b/Documentation/hwmon/adm1177.rst new file mode 100644 index 000000000000..c81e0b4abd28 --- /dev/null +++ b/Documentation/hwmon/adm1177.rst @@ -0,0 +1,36 @@ +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. diff --git a/Documentation/hwmon/drivetemp.rst b/Documentation/hwmon/drivetemp.rst new file mode 100644 index 000000000000..2d37d049247f --- /dev/null +++ b/Documentation/hwmon/drivetemp.rst @@ -0,0 +1,52 @@ +.. 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 +=======================	===================================================== diff --git a/Documentation/hwmon/index.rst b/Documentation/hwmon/index.rst index 43cc605741ea..b24adb67ddca 100644 --- a/Documentation/hwmon/index.rst +++ b/Documentation/hwmon/index.rst @@ -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 diff --git a/Documentation/hwmon/max20730.rst b/Documentation/hwmon/max20730.rst new file mode 100644 index 000000000000..cea7ae58c2f7 --- /dev/null +++ b/Documentation/hwmon/max20730.rst @@ -0,0 +1,74 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later + +Kernel driver max20730 +====================== + +Supported chips: + +  * Maxim MAX20730 + +    Prefix: 'max20730' + +    Addresses scanned: - + +    Datasheet: https://datasheets.maximintegrated.com/en/ds/MAX20730.pdf + +  * Maxim MAX20734 + +    Prefix: 'max20734' + +    Addresses scanned: - + +    Datasheet: https://datasheets.maximintegrated.com/en/ds/MAX20734.pdf + +  * Maxim MAX20743 + +    Prefix: 'max20743' + +    Addresses scanned: - + +    Datasheet: https://datasheets.maximintegrated.com/en/ds/MAX20743.pdf + +Author: Guenter Roeck <linux@roeck-us.net> + + +Description +----------- + +This driver implements support for Maxim MAX20730, MAX20734, and MAX20743 +Integrated, Step-Down Switching Regulators 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_crit          RW/RO Critical output current. Please see datasheet for +                          supported limits. Read-only if the chip is +                          write protected; read-write otherwise. +curr1_crit_alarm    RO    Output current critical alarm +curr1_input         RO    Output current +curr1_label         RO    'iout1' +in1_alarm           RO    Input voltage alarm +in1_input           RO    Input voltage +in1_label           RO    'vin' +in2_alarm           RO    Output voltage alarm +in2_input           RO    Output voltage +in2_label           RO    'vout1' +temp1_crit          RW/RO Critical temeperature. Supported values are 130 or 150 +                          degrees C. Read-only if the chip is write protected; +                          read-write otherwise. +temp1_crit_alarm    RO    Temperature critical alarm +temp1_input         RO    Chip temperature +=================== ===== ======================================================= diff --git a/Documentation/hwmon/max31730.rst b/Documentation/hwmon/max31730.rst new file mode 100644 index 000000000000..def0de19dbd2 --- /dev/null +++ b/Documentation/hwmon/max31730.rst @@ -0,0 +1,44 @@ +Kernel driver max31790 +====================== + +Supported chips: + +  * Maxim MAX31730 + +    Prefix: 'max31730' + +    Addresses scanned: 0x1c, 0x1d, 0x1e, 0x1f, 0x4c, 0x4d, 0x4e, 0x4f + +    Datasheet: https://datasheets.maximintegrated.com/en/ds/MAX31730.pdf + +Author: Guenter Roeck <linux@roeck-us.net> + + +Description +----------- + +This driver implements support for Maxim MAX31730. + +The MAX31730 temperature sensor monitors its own temperature and the +temperatures of three external diode-connected transistors. The operating +supply voltage is from 3.0V to 3.6V. Resistance cancellation compensates +for high series resistance in circuit-board traces and the external thermal +diode, while beta compensation corrects for temperature-measurement +errors due to low-beta sensing transistors. + + +Sysfs entries +------------- + +=================== == ======================================================= +temp[1-4]_enable    RW Temperature enable/disable +                       Set to 0 to enable channel, 0 to disable +temp[1-4]_input     RO Temperature input +temp[2-4]_fault     RO Fault indicator for remote channels +temp[1-4]_max       RW Maximum temperature +temp[1-4]_max_alarm RW Maximum temperature alarm +temp[1-4]_min       RW Minimum temperature. Common for all channels. +                       Only temp1_min is writeable. +temp[1-4]_min_alarm RO Minimum temperature alarm +temp[2-4]_offset    RW Temperature offset for remote channels +=================== == ======================================================= diff --git a/Documentation/hwmon/pmbus.rst b/Documentation/hwmon/pmbus.rst index abfb9dd4857d..f787984e88a9 100644 --- a/Documentation/hwmon/pmbus.rst +++ b/Documentation/hwmon/pmbus.rst @@ -63,6 +63,16 @@ Supported chips:  	http://www.ti.com/lit/gpn/tps544c25 +  * Maxim MAX20796 + +    Prefix: 'max20796' + +    Addresses scanned: - + +    Datasheet: + +	Not published +    * Generic PMBus devices      Prefix: 'pmbus' diff --git a/Documentation/hwmon/ucd9000.rst b/Documentation/hwmon/ucd9000.rst index 746f21fcb48c..704f0cbd95d3 100644 --- a/Documentation/hwmon/ucd9000.rst +++ b/Documentation/hwmon/ucd9000.rst @@ -3,9 +3,10 @@ Kernel driver ucd9000  Supported chips: -  * TI UCD90120, UCD90124, UCD90160, UCD9090, and UCD90910 +  * TI UCD90120, UCD90124, UCD90160, UCD90320, UCD9090, and UCD90910 -    Prefixes: 'ucd90120', 'ucd90124', 'ucd90160', 'ucd9090', 'ucd90910' +    Prefixes: 'ucd90120', 'ucd90124', 'ucd90160', 'ucd90320', 'ucd9090', +              'ucd90910'      Addresses scanned: - @@ -14,6 +15,7 @@ Supported chips:  	- http://focus.ti.com/lit/ds/symlink/ucd90120.pdf  	- http://focus.ti.com/lit/ds/symlink/ucd90124.pdf  	- http://focus.ti.com/lit/ds/symlink/ucd90160.pdf +	- http://focus.ti.com/lit/ds/symlink/ucd90320.pdf  	- http://focus.ti.com/lit/ds/symlink/ucd9090.pdf  	- http://focus.ti.com/lit/ds/symlink/ucd90910.pdf @@ -45,6 +47,12 @@ power-on reset signals, external interrupts, cascading, or other system  functions. Twelve of these pins offer PWM functionality. Using these pins, the  UCD90160 offers support for margining, and general-purpose PWM functions. +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. +  The UCD9090 is a 10-rail PMBus/I2C addressable power-supply sequencer and  monitor. The device integrates a 12-bit ADC for monitoring up to 10 power-supply  voltage inputs. Twenty-three GPIO pins can be used for power supply enables, diff --git a/Documentation/hwmon/xdpe12284.rst b/Documentation/hwmon/xdpe12284.rst new file mode 100644 index 000000000000..6b7ae98cc536 --- /dev/null +++ b/Documentation/hwmon/xdpe12284.rst @@ -0,0 +1,101 @@ +.. SPDX-License-Identifier: GPL-2.0 + +Kernel driver xdpe122 +===================== + +Supported chips: + +  * Infineon XDPE12254 + +    Prefix: 'xdpe12254' + +  * Infineon XDPE12284 + +    Prefix: 'xdpe12284' + +Authors: + +	Vadim Pasternak <vadimp@mellanox.com> + +Description +----------- + +This driver implements support for Infineon Multi-phase XDPE122 family +dual loop voltage regulators. +The family includes XDPE12284 and XDPE12254 devices. +The devices from this family complaint with: +- Intel VR13 and VR13HC rev 1.3, IMVP8 rev 1.2 and IMPVP9 rev 1.3 DC-DC +  converter specification. +- Intel SVID rev 1.9. protocol. +- PMBus rev 1.3 interface. + +Devices support linear format for reading input voltage, input and output current, +input and output power and temperature. +Device supports VID format for reading output voltage. The below modes are +supported: +- VR12.0 mode, 5-mV DAC - 0x01. +- VR12.5 mode, 10-mV DAC - 0x02. +- IMVP9 mode, 5-mV DAC - 0x03. +- AMD mode 6.25mV - 0x10. + +Devices support two pages for telemetry. + +The driver provides for current: input, maximum and critical thresholds +and maximum and critical alarms. Critical thresholds and critical alarm are +supported only for current output. +The driver exports the following attributes for via the sysfs files, where +indexes 1, 2 are for "iin" and 3, 4 for "iout": + +**curr[3-4]_crit** + +**curr[3-4]_crit_alarm** + +**curr[1-4]_input** + +**curr[1-4]_label** + +**curr[1-4]_max** + +**curr[1-4]_max_alarm** + +The driver provides for voltage: input, critical and low critical thresholds +and critical and low critical alarms. +The driver exports the following attributes for via the sysfs files, where +indexes 1, 2 are for "vin" and 3, 4 for "vout": + +**in[1-4]_crit** + +**in[1-4_crit_alarm** + +**in[1-4]_input** + +**in[1-4_label** + +**in[1-4]_lcrit** + +**in[1-41_lcrit_alarm** + +The driver provides for power: input and alarms. Power alarm is supported only +for power input. +The driver exports the following attributes for via the sysfs files, where +indexes 1, 2 are for "pin" and 3, 4 for "pout": + +**power[1-2]_alarm** + +**power[1-4]_input** + +**power[1-4]_label** + +The driver provides for temperature: input, maximum and critical thresholds +and maximum and critical alarms. +The driver exports the following attributes for via the sysfs files: + +**temp[1-2]_crit** + +**temp[1-2]_crit_alarm** + +**temp[1-2]_input** + +**temp[1-2]_max** + +**temp[1-2]_max_alarm** |