Skip to content

Commit 5dfec3c

Browse files
committed
Merge tag 'hwmon-for-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck: "New drivers: - pmbus: Support for MPS Multi-phase mp2856/mp2857 controller - pmbus: Support for MPS Multi-phase mp5990 - Driver for Gigabyte AORUS Waterforce AIO coolers Added support to existing drivers: - lm75: Support for AMS AS6200 temperature sensor - k10temp: Support for AMD Family 19h Model 8h - max31827: Support for max31828 and max31829 - sht3x: Support for sts3x - Add support for WMI SMM interface, and various related improvements. Add support for Optiplex 7000 - emc1403: Support for EMC1442 - npcm750-pwm-fan: Support for NPCM8xx - nct6775: Add support for 2 additional fan controls Minor improvements and bug fixes: - gigabyte_waterforce: Mark status report as received under a spinlock - aquacomputer_d5next: Remove unneeded CONFIG_DEBUG_FS #ifdef - gpio-fan: Convert txt bindings to yaml - smsc47m1: Various cleanups / improvements - corsair-cpro: use NULL instead of 0 - hp-wmi-sensors: Fix failure to load on EliteDesk 800 G6 - tmp513: Various cleanups - peci/dimmtemp: Bump timeout - pc87360: Bounds check data->innr usage - nct6775: Fix fan speed set failure in automatic mode - ABI: sysfs-class-hwmon: document various missing attributes - lm25066, max6650, nct6775: Use i2c_get_match_data() - aspeed-pwm-tacho: Fix -Wstringop-overflow warning" * tag 'hwmon-for-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (59 commits) hwmon: (gigabyte_waterforce) Mark status report as received under a spinlock hwmon: (lm75) Fix tmp112 default config hwmon: (lm75) Add AMS AS6200 temperature sensor dt-bindings: hwmon: (lm75) Add AMS AS6200 temperature sensor hwmon: (lm75) remove now-unused include hwmon: (pmbus) Add support for MPS Multi-phase mp2856/mp2857 controller dt-bindings: Add MP2856/MP2857 voltage regulator device hwmon: (aquacomputer_d5next) Remove unneeded CONFIG_DEBUG_FS #ifdef dt-bindings: hwmon: gpio-fan: Convert txt bindings to yaml hwmon: (k10temp) Add support for AMD Family 19h Model 8h hwmon: Add driver for Gigabyte AORUS Waterforce AIO coolers hwmon: (smsc47m1) Rename global platform device variable hwmon: (smsc47m1) Simplify device registration hwmon: (smsc47m1) Convert to platform remove callback returning void hwmon: (smsc47m1) Mark driver struct with __refdata to prevent section mismatch MAINTAINERS: Add maintainer for Baikal-T1 PVT hwmon driver hwmon: (sht3x) add sts3x support hwmon: (pmbus) Add ltc4286 driver dt-bindings: hwmon: Add lltc ltc4286 driver bindings hwmon: (max31827) Add custom attribute for resolution ...
2 parents 7912a63 + 41c7110 commit 5dfec3c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+3064
-497
lines changed

Documentation/ABI/testing/sysfs-class-hwmon

Lines changed: 100 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,15 @@ Description:
381381

382382
RW
383383

384+
What: /sys/class/hwmon/hwmonX/tempY_max_alarm
385+
Description:
386+
Maximum temperature alarm flag.
387+
388+
- 0: OK
389+
- 1: temperature has reached tempY_max
390+
391+
RO
392+
384393
What: /sys/class/hwmon/hwmonX/tempY_min
385394
Description:
386395
Temperature min value.
@@ -389,6 +398,15 @@ Description:
389398

390399
RW
391400

401+
What: /sys/class/hwmon/hwmonX/tempY_min_alarm
402+
Description:
403+
Minimum temperature alarm flag.
404+
405+
- 0: OK
406+
- 1: temperature has reached tempY_min
407+
408+
RO
409+
392410
What: /sys/class/hwmon/hwmonX/tempY_max_hyst
393411
Description:
394412
Temperature hysteresis value for max limit.
@@ -434,12 +452,7 @@ Description:
434452
- 0: OK
435453
- 1: temperature has reached tempY_crit
436454

437-
RW
438-
439-
Contrary to regular alarm flags which clear themselves
440-
automatically when read, this one sticks until cleared by
441-
the user. This is done by writing 0 to the file. Writing
442-
other values is unsupported.
455+
RO
443456

444457
What: /sys/class/hwmon/hwmonX/tempY_crit_hyst
445458
Description:
@@ -462,6 +475,15 @@ Description:
462475

463476
RW
464477

478+
What: /sys/class/hwmon/hwmonX/tempY_emergency_alarm
479+
Description:
480+
Emergency high temperature alarm flag.
481+
482+
- 0: OK
483+
- 1: temperature has reached tempY_emergency
484+
485+
RO
486+
465487
What: /sys/class/hwmon/hwmonX/tempY_emergency_hyst
466488
Description:
467489
Temperature hysteresis value for emergency limit.
@@ -887,15 +909,15 @@ Description:
887909

888910
RW
889911

890-
What: /sys/class/hwmon/hwmonX/humidityY_input
912+
What: /sys/class/hwmon/hwmonX/humidityY_alarm
891913
Description:
892-
Humidity
914+
Humidity limit detection
893915

894-
Unit: milli-percent (per cent mille, pcm)
916+
- 0: OK
917+
- 1: Humidity limit has been reached
895918

896919
RO
897920

898-
899921
What: /sys/class/hwmon/hwmonX/humidityY_enable
900922
Description:
901923
Enable or disable the sensors
@@ -908,6 +930,74 @@ Description:
908930

909931
RW
910932

933+
What: /sys/class/hwmon/hwmonX/humidityY_fault
934+
Description:
935+
Reports a humidity sensor failure.
936+
937+
- 1: Failed
938+
- 0: Ok
939+
940+
RO
941+
942+
What: /sys/class/hwmon/hwmonX/humidityY_input
943+
Description:
944+
Humidity
945+
946+
Unit: milli-percent (per cent mille, pcm)
947+
948+
RO
949+
950+
What: /sys/class/hwmon/hwmonX/humidityY_label
951+
Description:
952+
Suggested humidity channel label.
953+
954+
Text string
955+
956+
Should only be created if the driver has hints about what
957+
this humidity channel is being used for, and user-space
958+
doesn't. In all other cases, the label is provided by
959+
user-space.
960+
961+
RO
962+
963+
What: /sys/class/hwmon/hwmonX/humidityY_max
964+
Description:
965+
Humidity max value.
966+
967+
Unit: milli-percent (per cent mille, pcm)
968+
969+
RW
970+
971+
What: /sys/class/hwmon/hwmonX/humidityY_max_hyst
972+
Description:
973+
Humidity hysteresis value for max limit.
974+
975+
Unit: milli-percent (per cent mille, pcm)
976+
977+
Must be reported as an absolute humidity, NOT a delta
978+
from the max value.
979+
980+
RW
981+
982+
What: /sys/class/hwmon/hwmonX/humidityY_min
983+
Description:
984+
Humidity min value.
985+
986+
Unit: milli-percent (per cent mille, pcm)
987+
988+
RW
989+
990+
What: /sys/class/hwmon/hwmonX/humidityY_min_hyst
991+
Description:
992+
Humidity hysteresis value for min limit.
993+
994+
Unit: milli-percent (per cent mille, pcm)
995+
996+
Must be reported as an absolute humidity, NOT a delta
997+
from the min value.
998+
999+
RW
1000+
9111001
What: /sys/class/hwmon/hwmonX/humidityY_rated_min
9121002
Description:
9131003
Minimum rated humidity.

Documentation/devicetree/bindings/hwmon/gpio-fan.txt

Lines changed: 0 additions & 41 deletions
This file was deleted.
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/gpio-fan.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Fan connected to GPIO lines
8+
9+
maintainers:
10+
- Rob Herring <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: gpio-fan
15+
16+
gpios:
17+
description: |
18+
Specifies the pins that map to bits in the control value,
19+
ordered MSB-->LSB.
20+
minItems: 1
21+
maxItems: 7
22+
23+
alarm-gpios:
24+
maxItems: 1
25+
26+
gpio-fan,speed-map:
27+
$ref: /schemas/types.yaml#/definitions/uint32-matrix
28+
minItems: 2
29+
maxItems: 127
30+
items:
31+
items:
32+
- description: fan speed in RPMs
33+
- description: control value
34+
description: |
35+
A mapping of possible fan RPM speeds and the
36+
control value that should be set to achieve them. This array
37+
must have the RPM values in ascending order.
38+
39+
'#cooling-cells':
40+
const: 2
41+
42+
required:
43+
- compatible
44+
- gpios
45+
- gpio-fan,speed-map
46+
47+
additionalProperties: false
48+
49+
examples:
50+
- |
51+
gpio-fan {
52+
compatible = "gpio-fan";
53+
gpios = <&gpio2 14 1
54+
&gpio2 13 1>;
55+
gpio-fan,speed-map = < 0 0>,
56+
<3000 1>,
57+
<6000 2>;
58+
alarm-gpios = <&gpio2 15 1>;
59+
#cooling-cells = <2>; /* min followed by max */
60+
};

Documentation/devicetree/bindings/hwmon/iio-hwmon.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ properties:
1919

2020
io-channels:
2121
minItems: 1
22-
maxItems: 8 # Should be enough
22+
maxItems: 51 # Should be enough
2323
description: >
2424
List of phandles to ADC channels to read the monitoring values
2525
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/lltc,ltc4286.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: LTC4286 power monitors
8+
9+
maintainers:
10+
- Delphine CC Chiu <[email protected]>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- lltc,ltc4286
16+
- lltc,ltc4287
17+
18+
reg:
19+
maxItems: 1
20+
21+
adi,vrange-low-enable:
22+
description:
23+
This property is a bool parameter to represent the
24+
voltage range is 25.6 volts or 102.4 volts for this chip.
25+
The default is 102.4 volts.
26+
type: boolean
27+
28+
shunt-resistor-micro-ohms:
29+
description:
30+
Resistor value micro-ohms.
31+
32+
required:
33+
- compatible
34+
- reg
35+
36+
additionalProperties: false
37+
38+
examples:
39+
- |
40+
i2c {
41+
#address-cells = <1>;
42+
#size-cells = <0>;
43+
44+
power-monitor@40 {
45+
compatible = "lltc,ltc4286";
46+
reg = <0x40>;
47+
adi,vrange-low-enable;
48+
shunt-resistor-micro-ohms = <300>;
49+
};
50+
};

Documentation/devicetree/bindings/hwmon/lm75.yaml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ properties:
1414
compatible:
1515
enum:
1616
- adi,adt75
17+
- ams,as6200
1718
- atmel,at30ts74
1819
- dallas,ds1775
1920
- dallas,ds75
@@ -48,10 +49,28 @@ properties:
4849
vs-supply:
4950
description: phandle to the regulator that provides the +VS supply
5051

52+
interrupts:
53+
maxItems: 1
54+
5155
required:
5256
- compatible
5357
- reg
5458

59+
allOf:
60+
- if:
61+
not:
62+
properties:
63+
compatible:
64+
contains:
65+
enum:
66+
- ams,as6200
67+
- ti,tmp100
68+
- ti,tmp101
69+
- ti,tmp112
70+
then:
71+
properties:
72+
interrupts: false
73+
5574
additionalProperties: false
5675

5776
examples:
@@ -66,3 +85,17 @@ examples:
6685
vs-supply = <&vs>;
6786
};
6887
};
88+
- |
89+
#include <dt-bindings/interrupt-controller/irq.h>
90+
i2c {
91+
#address-cells = <1>;
92+
#size-cells = <0>;
93+
94+
temperature-sensor@48 {
95+
compatible = "ams,as6200";
96+
reg = <0x48>;
97+
vs-supply = <&vs>;
98+
interrupt-parent = <&gpio1>;
99+
interrupts = <17 IRQ_TYPE_EDGE_BOTH>;
100+
};
101+
};

Documentation/devicetree/bindings/trivial-devices.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@ properties:
117117
- fsl,mpl3115
118118
# MPR121: Proximity Capacitive Touch Sensor Controller
119119
- fsl,mpr121
120+
# Monolithic Power Systems Inc. multi-phase controller mp2856
121+
- mps,mp2856
122+
# Monolithic Power Systems Inc. multi-phase controller mp2857
123+
- mps,mp2857
120124
# Monolithic Power Systems Inc. multi-phase controller mp2888
121125
- mps,mp2888
122126
# Monolithic Power Systems Inc. multi-phase controller mp2971
@@ -125,6 +129,8 @@ properties:
125129
- mps,mp2973
126130
# Monolithic Power Systems Inc. multi-phase controller mp2975
127131
- mps,mp2975
132+
# Monolithic Power Systems Inc. multi-phase hot-swap controller mp5990
133+
- mps,mp5990
128134
# Honeywell Humidicon HIH-6130 humidity/temperature sensor
129135
- honeywell,hi6130
130136
# IBM Common Form Factor Power Supply Versions (all versions)

0 commit comments

Comments
 (0)