Skip to content

Commit 64ae88f

Browse files
committed
Merge tag 'hwmon-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck: - Substantial rewrite of lm90 driver to support several additional chips and improve support for existing chips. - Add support of ROG ZENITH II EXTREME, Maximus XI Hero, and Strix Z690-a D4 to asus-ec-sensors driver - Add support of F71858AD to f71882fg driver - Add support of Aquacomputer Quadro to aquacomputer_d5next driver - Improved assembler code and add support for Dell G5 5590 as well as XPS 13 7390 in dell-smm driver - Add support for ASUS TUF GAMING B550-PLUS WIFI II to nct775 driver - Add support for IEEE 754 half precision to PMBus core. Also support for Analog Devices LT7182S, improve regulator support, and report various MFR register values in debugfs. - Various other minor improvements and fixes * tag 'hwmon-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (85 commits) hwmon: (aquacomputer_d5next) Add support for Aquacomputer Quadro fan controller hwmon: (dell-smm) Improve documentation hwmon: (nct6775) add ASUS TUF GAMING B550-PLUS WIFI II hwmon: (occ) Replace open-coded variant of %*phN specifier hwmon: (sht15) Fix wrong assumptions in device remove callback hwmon: (aquacomputer_d5next) Add support for reading the +12V voltage sensor on D5 Next hwmon: (tps23861) fix byte order in current and voltage registers hwmon: (aspeed-pwm-tacho) increase fan tach period (again) hwmon: (aquacomputer_d5next) Add D5 Next fan control support hwmon: (mcp3021) improve driver support for newer hwmon interface hwmon: (asus-ec-sensors) add definitions for ROG ZENITH II EXTREME hwmon: (aquacomputer_d5next) Move device-specific data into struct aqc_data hwmon: (asus-ec-sensors) add missing sensors for X570-I GAMING hwmon: (drivetemp) Add module alias hwmon: (asus_wmi_sensors) Save a few bytes of memory hwmon: (lm90) Use worker for alarm notifications hwmon: (asus-ec-sensors) add support for Maximus XI Hero hwmon: (dell-smm) Improve assembly code hwmon: (pmbus/ltc2978) Set voltage resolution hwmon: (pmbus) Add list_voltage to pmbus ops ...
2 parents 530c28d + cdbe34d commit 64ae88f

34 files changed

+3309
-1221
lines changed

Documentation/ABI/testing/sysfs-class-hwmon

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -938,3 +938,12 @@ Description:
938938
- 1: enable
939939

940940
RW
941+
942+
What: /sys/class/hwmon/hwmonX/device/pec
943+
Description:
944+
PEC support on I2C devices
945+
946+
- 0, off, n: disable
947+
- 1, on, y: enable
948+
949+
RW

Documentation/devicetree/bindings/hwmon/national,lm90.yaml

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ properties:
1616
- adi,adm1032
1717
- adi,adt7461
1818
- adi,adt7461a
19+
- adi,adt7481
1920
- dallas,max6646
2021
- dallas,max6647
2122
- dallas,max6649
@@ -50,6 +51,12 @@ properties:
5051
"#thermal-sensor-cells":
5152
const: 1
5253

54+
'#address-cells':
55+
const: 1
56+
57+
'#size-cells':
58+
const: 0
59+
5360
vcc-supply:
5461
description: phandle to the regulator that provides the +VCC supply
5562

@@ -61,6 +68,29 @@ required:
6168
- compatible
6269
- reg
6370

71+
patternProperties:
72+
"^channel@([0-2])$":
73+
type: object
74+
description: Represents channels of the device and their specific configuration.
75+
76+
properties:
77+
reg:
78+
description: The channel number. 0 is local channel, 1-2 are remote channels.
79+
items:
80+
minimum: 0
81+
maximum: 2
82+
83+
label:
84+
description: A descriptive name for this channel, like "ambient" or "psu".
85+
86+
temperature-offset-millicelsius:
87+
description: Temperature offset to be added to or subtracted from remote temperature measurements.
88+
89+
required:
90+
- reg
91+
92+
additionalProperties: false
93+
6494
allOf:
6595
- if:
6696
not:
@@ -70,12 +100,84 @@ allOf:
70100
enum:
71101
- adi,adt7461
72102
- adi,adt7461a
103+
- adi,adt7481
73104
- ti,tmp451
74105
- ti,tmp461
75106
then:
76107
properties:
77108
ti,extended-range-enable: false
78109

110+
- if:
111+
properties:
112+
compatible:
113+
contains:
114+
enum:
115+
- dallas,max6646
116+
- dallas,max6647
117+
- dallas,max6649
118+
- dallas,max6657
119+
- dallas,max6658
120+
- dallas,max6659
121+
- dallas,max6695
122+
- dallas,max6696
123+
then:
124+
patternProperties:
125+
"^channel@([0-2])$":
126+
properties:
127+
temperature-offset-millicelsius: false
128+
129+
- if:
130+
properties:
131+
compatible:
132+
contains:
133+
enum:
134+
- adi,adt7461
135+
- adi,adt7461a
136+
- adi,adt7481
137+
- onnn,nct1008
138+
then:
139+
patternProperties:
140+
"^channel@([0-2])$":
141+
properties:
142+
temperature-offset-millicelsius:
143+
maximum: 127750
144+
145+
- if:
146+
properties:
147+
compatible:
148+
contains:
149+
enum:
150+
- adi,adm1032
151+
- dallas,max6680
152+
- dallas,max6681
153+
- gmt,g781
154+
- national,lm86
155+
- national,lm89
156+
- national,lm90
157+
- national,lm99
158+
- nxp,sa56004
159+
- winbond,w83l771
160+
then:
161+
patternProperties:
162+
"^channel@([0-2])$":
163+
properties:
164+
temperature-offset-millicelsius:
165+
maximum: 127875
166+
167+
- if:
168+
properties:
169+
compatible:
170+
contains:
171+
enum:
172+
- ti,tmp451
173+
- ti,tmp461
174+
then:
175+
patternProperties:
176+
"^channel@([0-2])$":
177+
properties:
178+
temperature-offset-millicelsius:
179+
maximum: 127937
180+
79181
additionalProperties: false
80182

81183
examples:
@@ -94,3 +196,32 @@ examples:
94196
#thermal-sensor-cells = <1>;
95197
};
96198
};
199+
- |
200+
i2c {
201+
#address-cells = <1>;
202+
#size-cells = <0>;
203+
204+
sensor@4c {
205+
compatible = "adi,adt7481";
206+
reg = <0x4c>;
207+
#address-cells = <1>;
208+
#size-cells = <0>;
209+
210+
channel@0 {
211+
reg = <0x0>;
212+
label = "local";
213+
};
214+
215+
channel@1 {
216+
reg = <0x1>;
217+
label = "front";
218+
temperature-offset-millicelsius = <4000>;
219+
};
220+
221+
channel@2 {
222+
reg = <0x2>;
223+
label = "back";
224+
temperature-offset-millicelsius = <750>;
225+
};
226+
};
227+
};

Documentation/devicetree/bindings/trivial-devices.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ properties:
4141
- adi,adp5585-02
4242
# Analog Devices ADP5589 Keypad Decoder and I/O Expansion
4343
- adi,adp5589
44+
# Analog Devices LT7182S Dual Channel 6A, 20V PolyPhase Step-Down Silent Switcher
45+
- adi,lt7182s
4446
# AMS iAQ-Core VOC Sensor
4547
- ams,iaq-core
4648
# i2c serial eeprom (24cxx)

Documentation/hwmon/aquacomputer_d5next.rst

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Supported devices:
99
* Aquacomputer Farbwerk RGB controller
1010
* Aquacomputer Farbwerk 360 RGB controller
1111
* Aquacomputer Octo fan controller
12+
* Aquacomputer Quadro fan controller
1213

1314
Author: Aleksa Savic
1415

@@ -33,6 +34,9 @@ better suited for userspace tools.
3334
The Octo exposes four temperature sensors and eight PWM controllable fans, along
3435
with their speed (in RPM), power, voltage and current.
3536

37+
The Quadro exposes four temperature sensors, a flow sensor and four PWM controllable
38+
fans, along with their speed (in RPM), power, voltage and current.
39+
3640
The Farbwerk and Farbwerk 360 expose four temperature sensors. Depending on the device,
3741
not all sysfs and debugfs entries will be available.
3842

@@ -45,13 +49,14 @@ the kernel and supports hotswapping.
4549
Sysfs entries
4650
-------------
4751

48-
================ =============================================
52+
================ ==============================================
4953
temp[1-4]_input Temperature sensors (in millidegrees Celsius)
50-
fan[1-2]_input Pump/fan speed (in RPM)
51-
power[1-2]_input Pump/fan power (in micro Watts)
52-
in[0-2]_input Pump/fan voltage (in milli Volts)
53-
curr[1-2]_input Pump/fan current (in milli Amperes)
54-
================ =============================================
54+
fan[1-8]_input Pump/fan speed (in RPM) / Flow speed (in dL/h)
55+
power[1-8]_input Pump/fan power (in micro Watts)
56+
in[0-7]_input Pump/fan voltage (in milli Volts)
57+
curr[1-8]_input Pump/fan current (in milli Amperes)
58+
pwm[1-8] Fan PWM (0 - 255)
59+
================ ==============================================
5560

5661
Debugfs entries
5762
---------------

Documentation/hwmon/asus_ec_sensors.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@ Supported boards:
1313
* ROG CROSSHAIR VIII FORMULA
1414
* ROG CROSSHAIR VIII HERO
1515
* ROG CROSSHAIR VIII IMPACT
16+
* ROG MAXIMUS XI HERO
17+
* ROG MAXIMUS XI HERO (WI-FI)
1618
* ROG STRIX B550-E GAMING
1719
* ROG STRIX B550-I GAMING
1820
* ROG STRIX X570-E GAMING
1921
* ROG STRIX X570-E GAMING WIFI II
2022
* ROG STRIX X570-F GAMING
2123
* ROG STRIX X570-I GAMING
24+
* ROG STRIX Z690-A GAMING WIFI D4
25+
* ROG ZENITH II EXTREME
2226

2327
Authors:
2428
- Eugene Shalygin <[email protected]>

Documentation/hwmon/dell-smm-hwmon.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ temp[1-10]_input RO Temperature reading in milli-degrees
4646
temp[1-10]_label RO Temperature sensor label.
4747
=============================== ======= =======================================
4848

49+
Due to the nature of the SMM interface, each pwmX attribute controls
50+
fan number X.
51+
4952
Disabling automatic BIOS fan control
5053
------------------------------------
5154

Documentation/hwmon/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ Hardware Monitoring Kernel Drivers
109109
lm95234
110110
lm95245
111111
lochnagar
112+
lt7182s
112113
ltc2992
113114
ltc2945
114115
ltc2947

0 commit comments

Comments
 (0)