Skip to content

Commit 35417d5

Browse files
committed
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 ...
2 parents 189fc98 + fd8bdb2 commit 35417d5

34 files changed

+3639
-1522
lines changed
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/adi,adm1177.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Analog Devices ADM1177 Hot Swap Controller and Digital Power Monitor
8+
9+
maintainers:
10+
- Michael Hennerich <[email protected]>
11+
- Beniamin Bia <[email protected]>
12+
13+
description: |
14+
Analog Devices ADM1177 Hot Swap Controller and Digital Power Monitor
15+
https://www.analog.com/media/en/technical-documentation/data-sheets/ADM1177.pdf
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- adi,adm1177
21+
22+
reg:
23+
maxItems: 1
24+
25+
avcc-supply:
26+
description:
27+
Phandle to the Avcc power supply
28+
29+
shunt-resistor-micro-ohms:
30+
description:
31+
The value of curent sense resistor in microohms. If not provided,
32+
the current reading and overcurrent alert is disabled.
33+
34+
adi,shutdown-threshold-microamp:
35+
description:
36+
Specifies the current level at which an over current alert occurs.
37+
If not provided, the overcurrent alert is configured to max ADC range
38+
based on shunt-resistor-micro-ohms.
39+
40+
adi,vrange-high-enable:
41+
description:
42+
Specifies which internal voltage divider to be used. A 1 selects
43+
a 7:2 voltage divider while a 0 selects a 14:1 voltage divider.
44+
type: boolean
45+
46+
required:
47+
- compatible
48+
- reg
49+
50+
examples:
51+
- |
52+
#include <dt-bindings/gpio/gpio.h>
53+
#include <dt-bindings/interrupt-controller/irq.h>
54+
i2c0 {
55+
#address-cells = <1>;
56+
#size-cells = <0>;
57+
58+
pwmon@5a {
59+
compatible = "adi,adm1177";
60+
reg = <0x5a>;
61+
shunt-resistor-micro-ohms = <50000>; /* 50 mOhm */
62+
adi,shutdown-threshold-microamp = <1059000>; /* 1.059 A */
63+
adi,vrange-high-enable;
64+
};
65+
};
66+
...
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
5+
$id: http://devicetree.org/schemas/hwmon/pmbus/ti,ucd90320.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: UCD90320 power sequencer
9+
10+
maintainers:
11+
- Jim Wright <[email protected]>
12+
13+
description: |
14+
The UCD90320 is a 32-rail PMBus/I2C addressable power-supply sequencer and
15+
monitor. The 24 integrated ADC channels (AMONx) monitor the power supply
16+
voltage, current, and temperature. Of the 84 GPIO pins, 8 can be used as
17+
digital monitors (DMONx), 32 to enable the power supply (ENx), 24 for
18+
margining (MARx), 16 for logical GPO, and 32 GPIs for cascading, and system
19+
function.
20+
21+
http://focus.ti.com/lit/ds/symlink/ucd90320.pdf
22+
23+
properties:
24+
compatible:
25+
enum:
26+
- ti,ucd90320
27+
28+
reg:
29+
maxItems: 1
30+
31+
required:
32+
- compatible
33+
- reg
34+
35+
examples:
36+
- |
37+
i2c {
38+
#address-cells = <1>;
39+
#size-cells = <0>;
40+
41+
ucd90320@11 {
42+
compatible = "ti,ucd90320";
43+
reg = <0x11>;
44+
};
45+
};

Documentation/hwmon/adm1177.rst

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
Kernel driver adm1177
2+
=====================
3+
4+
Supported chips:
5+
* Analog Devices ADM1177
6+
Prefix: 'adm1177'
7+
Datasheet: https://www.analog.com/media/en/technical-documentation/data-sheets/ADM1177.pdf
8+
9+
Author: Beniamin Bia <[email protected]>
10+
11+
12+
Description
13+
-----------
14+
15+
This driver supports hardware monitoring for Analog Devices ADM1177
16+
Hot-Swap Controller and Digital Power Monitors with Soft Start Pin.
17+
18+
19+
Usage Notes
20+
-----------
21+
22+
This driver does not auto-detect devices. You will have to instantiate the
23+
devices explicitly. Please see Documentation/i2c/instantiating-devices for
24+
details.
25+
26+
27+
Sysfs entries
28+
-------------
29+
30+
The following attributes are supported. Current maxim attribute
31+
is read-write, all other attributes are read-only.
32+
33+
in0_input Measured voltage in microvolts.
34+
35+
curr1_input Measured current in microamperes.
36+
curr1_max_alarm Overcurrent alarm in microamperes.

Documentation/hwmon/drivetemp.rst

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
3+
Kernel driver drivetemp
4+
=======================
5+
6+
7+
References
8+
----------
9+
10+
ANS T13/1699-D
11+
Information technology - AT Attachment 8 - ATA/ATAPI Command Set (ATA8-ACS)
12+
13+
ANS Project T10/BSR INCITS 513
14+
Information technology - SCSI Primary Commands - 4 (SPC-4)
15+
16+
ANS Project INCITS 557
17+
Information technology - SCSI / ATA Translation - 5 (SAT-5)
18+
19+
20+
Description
21+
-----------
22+
23+
This driver supports reporting the temperature of disk and solid state
24+
drives with temperature sensors.
25+
26+
If supported, it uses the ATA SCT Command Transport feature to read
27+
the current drive temperature and, if available, temperature limits
28+
as well as historic minimum and maximum temperatures. If SCT Command
29+
Transport is not supported, the driver uses SMART attributes to read
30+
the drive temperature.
31+
32+
33+
Sysfs entries
34+
-------------
35+
36+
Only the temp1_input attribute is always available. Other attributes are
37+
available only if reported by the drive. All temperatures are reported in
38+
milli-degrees Celsius.
39+
40+
======================= =====================================================
41+
temp1_input Current drive temperature
42+
temp1_lcrit Minimum temperature limit. Operating the device below
43+
this temperature may cause physical damage to the
44+
device.
45+
temp1_min Minimum recommended continuous operating limit
46+
temp1_max Maximum recommended continuous operating temperature
47+
temp1_crit Maximum temperature limit. Operating the device above
48+
this temperature may cause physical damage to the
49+
device.
50+
temp1_lowest Minimum temperature seen this power cycle
51+
temp1_highest Maximum temperature seen this power cycle
52+
======================= =====================================================

Documentation/hwmon/index.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Hardware Monitoring Kernel Drivers
2929
adm1025
3030
adm1026
3131
adm1031
32+
adm1177
3233
adm1275
3334
adm9240
3435
ads7828
@@ -47,6 +48,7 @@ Hardware Monitoring Kernel Drivers
4748
da9055
4849
dell-smm-hwmon
4950
dme1737
51+
drivetemp
5052
ds1621
5153
ds620
5254
emc1403
@@ -106,8 +108,10 @@ Hardware Monitoring Kernel Drivers
106108
max1619
107109
max1668
108110
max197
111+
max20730
109112
max20751
110113
max31722
114+
max31730
111115
max31785
112116
max31790
113117
max34440
@@ -177,6 +181,7 @@ Hardware Monitoring Kernel Drivers
177181
wm831x
178182
wm8350
179183
xgene-hwmon
184+
xdpe12284
180185
zl6100
181186

182187
.. only:: subproject and html

Documentation/hwmon/max20730.rst

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
.. SPDX-License-Identifier: GPL-2.0-or-later
2+
3+
Kernel driver max20730
4+
======================
5+
6+
Supported chips:
7+
8+
* Maxim MAX20730
9+
10+
Prefix: 'max20730'
11+
12+
Addresses scanned: -
13+
14+
Datasheet: https://datasheets.maximintegrated.com/en/ds/MAX20730.pdf
15+
16+
* Maxim MAX20734
17+
18+
Prefix: 'max20734'
19+
20+
Addresses scanned: -
21+
22+
Datasheet: https://datasheets.maximintegrated.com/en/ds/MAX20734.pdf
23+
24+
* Maxim MAX20743
25+
26+
Prefix: 'max20743'
27+
28+
Addresses scanned: -
29+
30+
Datasheet: https://datasheets.maximintegrated.com/en/ds/MAX20743.pdf
31+
32+
Author: Guenter Roeck <[email protected]>
33+
34+
35+
Description
36+
-----------
37+
38+
This driver implements support for Maxim MAX20730, MAX20734, and MAX20743
39+
Integrated, Step-Down Switching Regulators with PMBus support.
40+
41+
The driver is a client driver to the core PMBus driver.
42+
Please see Documentation/hwmon/pmbus.rst for details on PMBus client drivers.
43+
44+
45+
Usage Notes
46+
-----------
47+
48+
This driver does not auto-detect devices. You will have to instantiate the
49+
devices explicitly. Please see Documentation/i2c/instantiating-devices.rst for
50+
details.
51+
52+
53+
Sysfs entries
54+
-------------
55+
56+
=================== ===== =======================================================
57+
curr1_crit RW/RO Critical output current. Please see datasheet for
58+
supported limits. Read-only if the chip is
59+
write protected; read-write otherwise.
60+
curr1_crit_alarm RO Output current critical alarm
61+
curr1_input RO Output current
62+
curr1_label RO 'iout1'
63+
in1_alarm RO Input voltage alarm
64+
in1_input RO Input voltage
65+
in1_label RO 'vin'
66+
in2_alarm RO Output voltage alarm
67+
in2_input RO Output voltage
68+
in2_label RO 'vout1'
69+
temp1_crit RW/RO Critical temeperature. Supported values are 130 or 150
70+
degrees C. Read-only if the chip is write protected;
71+
read-write otherwise.
72+
temp1_crit_alarm RO Temperature critical alarm
73+
temp1_input RO Chip temperature
74+
=================== ===== =======================================================

Documentation/hwmon/max31730.rst

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
Kernel driver max31790
2+
======================
3+
4+
Supported chips:
5+
6+
* Maxim MAX31730
7+
8+
Prefix: 'max31730'
9+
10+
Addresses scanned: 0x1c, 0x1d, 0x1e, 0x1f, 0x4c, 0x4d, 0x4e, 0x4f
11+
12+
Datasheet: https://datasheets.maximintegrated.com/en/ds/MAX31730.pdf
13+
14+
Author: Guenter Roeck <[email protected]>
15+
16+
17+
Description
18+
-----------
19+
20+
This driver implements support for Maxim MAX31730.
21+
22+
The MAX31730 temperature sensor monitors its own temperature and the
23+
temperatures of three external diode-connected transistors. The operating
24+
supply voltage is from 3.0V to 3.6V. Resistance cancellation compensates
25+
for high series resistance in circuit-board traces and the external thermal
26+
diode, while beta compensation corrects for temperature-measurement
27+
errors due to low-beta sensing transistors.
28+
29+
30+
Sysfs entries
31+
-------------
32+
33+
=================== == =======================================================
34+
temp[1-4]_enable RW Temperature enable/disable
35+
Set to 0 to enable channel, 0 to disable
36+
temp[1-4]_input RO Temperature input
37+
temp[2-4]_fault RO Fault indicator for remote channels
38+
temp[1-4]_max RW Maximum temperature
39+
temp[1-4]_max_alarm RW Maximum temperature alarm
40+
temp[1-4]_min RW Minimum temperature. Common for all channels.
41+
Only temp1_min is writeable.
42+
temp[1-4]_min_alarm RO Minimum temperature alarm
43+
temp[2-4]_offset RW Temperature offset for remote channels
44+
=================== == =======================================================

Documentation/hwmon/pmbus.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,16 @@ Supported chips:
6363

6464
http://www.ti.com/lit/gpn/tps544c25
6565

66+
* Maxim MAX20796
67+
68+
Prefix: 'max20796'
69+
70+
Addresses scanned: -
71+
72+
Datasheet:
73+
74+
Not published
75+
6676
* Generic PMBus devices
6777

6878
Prefix: 'pmbus'

0 commit comments

Comments
 (0)