Skip to content

Commit 989253c

Browse files
committed
Merge tag 'hwmon-for-v6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck: "New drivers: - Kontron SMARC-sAM67 - GPD device sensors - MP29502 - MP2869, MP29608, MP29612 and MP29816 series Added chip support to existing drivers: - asus-ec-sensors: Add B650E-I Add PRIME Z270-A Add Pro WS WRX90E-SAGE SE Add ROG STRIX X670E-E GAMING WIFI Add ROG STRIX X870-I GAMING WIFI Add ROG STRIX X870E-E GAMING WIFI Add ROG STRIX Z690-E GAMING WIFI Add ROG STRIX Z790E GAMING WIFI II Add STRIX B850-I GAMING WIFI Add TUF GAMING X670E PLUS WIFI Add X670E-I GAMING WIFI Add Z790-I GAMING WIFI - dell-smm: Add support for Dell OptiPlex 7040 - ina238: Major cleanup, and Add support for INA700 Add support for INA780 - k10temp: Add device ID for Strix Halo Add support for AMD Family 1Ah-based models - lenovo-ec-sensors: Update P8 supprt - lm75: Add NXP P3T1750 support - pmbus/adm1275: Add sq24905c support - pmbus/isl68137: Add support for Renesas RAA228244 and RAA228246 - pmbus/mp5990: Add support for MP5998 - sht21: Add support for SHT20, SHT25 - sl28cpld: Add sa67mcu compatible Other notable changes: - core: Handle locking internally Introduce 64-bit energy attribute support - cros_ec: Register into thermal framework, improve PWM control - lm75: allow interrupt for ti,tmp75 - mlxreg-fan: Add support for new flavour of capability register - sbtsi_temp: AMD CPU extended temperature range support - sht21: Add devicetree support Various other minor improvements and fixes" * tag 'hwmon-for-v6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (86 commits) dt-bindings: hwmon: (lm75) allow interrupt for ti,tmp75 hwmon: (mlxreg-fan) Add support for new flavour of capability register hwmon: (mlxreg-fan) Separate methods of fan setting coming from different subsystems hwmon: (cros_ec) register fans into thermal framework cooling devices hwmon: (cros_ec) add PWM control over fans platform/chrome: update pwm fan control host commands hwmon: add SMARC-sAM67 support dt-bindings: hwmon: sl28cpld: add sa67mcu compatible hwmon: (asus-ec-sensors) add TUF GAMING X670E PLUS WIFI hwmon: (dell-smm) Add support for Dell OptiPlex 7040 hwmon: (dell-smm) Add support for automatic fan mode hwmon: (gpd-fan) complete Kconfig dependencies hwmon: (asus-ec-sensors) increase timeout for locking ACPI mutex hwmon: (asus-ec-sensors) add ROG STRIX X870E-E GAMING WIFI hwmon: (dell-smm) Move clamping of fan speed out of i8k_set_fan() hwmon: (dell-smm) Remove Dell Precision 490 custom config data hwmon: (asus-ec-sensors) add ROG STRIX X670E-E GAMING WIFI hwmon: (gpd-fan) Fix range check for pwm input hwmon: (pmbus/mp5990) add support for MP5998 dt-bindings: trivial-devices: add mps,mp5998 ...
2 parents 57cf7a6 + 76bb696 commit 989253c

61 files changed

Lines changed: 4283 additions & 594 deletions

Some content is hidden

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

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ description: |
1818
Datasheets:
1919
https://www.analog.com/en/products/adm1294.html
2020
21+
The SQ24905C is also a Hot-swap controller compatibility to the ADM1278,
22+
the PMBUS_MFR_MODEL is MC09C
23+
24+
Datasheets:
25+
https://www.silergy.com/
26+
download/downloadFile?id=5669&type=product&ftype=note
27+
2128
properties:
2229
compatible:
2330
enum:
@@ -30,6 +37,7 @@ properties:
3037
- adi,adm1281
3138
- adi,adm1293
3239
- adi,adm1294
40+
- silergy,mc09c
3341

3442
reg:
3543
maxItems: 1
@@ -96,6 +104,7 @@ allOf:
96104
- adi,adm1281
97105
- adi,adm1293
98106
- adi,adm1294
107+
- silergy,mc09c
99108
then:
100109
properties:
101110
adi,volt-curr-sample-average:

Documentation/devicetree/bindings/hwmon/kontron,sl28cpld-hwmon.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ description: |
1616
properties:
1717
compatible:
1818
enum:
19+
- kontron,sa67mcu-hwmon
1920
- kontron,sl28cpld-fan
2021

2122
reg:
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/lantiq,cputemp.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Lantiq cpu temperature sensor
8+
9+
maintainers:
10+
- Florian Eckert <fe@dev.tdt.de>
11+
12+
properties:
13+
compatible:
14+
const: lantiq,cputemp
15+
16+
reg:
17+
maxItems: 1
18+
19+
required:
20+
- compatible
21+
- reg
22+
23+
additionalProperties: false
24+
25+
examples:
26+
- |
27+
cputemp@103040 {
28+
compatible = "lantiq,cputemp";
29+
reg = <0x103040 0x4>;
30+
};

Documentation/devicetree/bindings/hwmon/lm75.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ properties:
2828
- maxim,max31725
2929
- maxim,max31726
3030
- maxim,mcp980x
31+
- nxp,p3t1750
3132
- nxp,p3t1755
3233
- nxp,pct2075
3334
- st,stds75
@@ -69,6 +70,7 @@ allOf:
6970
- ti,tmp100
7071
- ti,tmp101
7172
- ti,tmp112
73+
- ti,tmp75
7274
then:
7375
properties:
7476
interrupts: false

Documentation/devicetree/bindings/hwmon/ltq-cputemp.txt

Lines changed: 0 additions & 10 deletions
This file was deleted.

Documentation/devicetree/bindings/hwmon/pmbus/isil,isl68137.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ properties:
5454
- renesas,raa228004
5555
- renesas,raa228006
5656
- renesas,raa228228
57+
- renesas,raa228244
58+
- renesas,raa228246
5759
- renesas,raa229001
5860
- renesas,raa229004
5961
- renesas,raa229621

Documentation/devicetree/bindings/hwmon/pwm-fan.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@ properties:
3131
it must be self resetting edge interrupts.
3232
maxItems: 1
3333

34+
fan-shutdown-percent:
35+
description:
36+
Fan RPM in percent set during shutdown. This is used to keep the fan
37+
running at fixed RPM after the kernel shut down, which is useful on
38+
hardware that does keep heating itself even after the kernel did shut
39+
down, for example from some sort of management core.
40+
minimum: 0
41+
maximum: 100
42+
3443
fan-stop-to-start-percent:
3544
description:
3645
Minimum fan RPM in percent to start when stopped.

Documentation/devicetree/bindings/hwmon/ti,ina2xx.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ properties:
3232
- ti,ina237
3333
- ti,ina238
3434
- ti,ina260
35+
- ti,ina700
36+
- ti,ina780
3537

3638
reg:
3739
maxItems: 1
@@ -114,10 +116,42 @@ allOf:
114116
- ti,ina237
115117
- ti,ina238
116118
- ti,ina260
119+
- ti,ina700
120+
- ti,ina780
117121
then:
118122
properties:
119123
ti,maximum-expected-current-microamp: false
120124

125+
- if:
126+
properties:
127+
compatible:
128+
contains:
129+
enum:
130+
- silergy,sy24655
131+
- ti,ina209
132+
- ti,ina219
133+
- ti,ina220
134+
- ti,ina226
135+
- ti,ina230
136+
- ti,ina231
137+
- ti,ina260
138+
- ti,ina700
139+
- ti,ina780
140+
then:
141+
properties:
142+
ti,shunt-gain: false
143+
144+
- if:
145+
properties:
146+
compatible:
147+
contains:
148+
enum:
149+
- ti,ina700
150+
- ti,ina780
151+
then:
152+
properties:
153+
shunt-resistor: false
154+
121155
unevaluatedProperties: false
122156

123157
examples:

Documentation/devicetree/bindings/hwmon/ti,tmp102.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ properties:
2020
reg:
2121
maxItems: 1
2222

23+
label:
24+
description:
25+
A descriptive name for this channel, like "ambient" or "psu".
26+
2327
"#thermal-sensor-cells":
2428
const: 1
2529

@@ -45,6 +49,7 @@ examples:
4549
reg = <0x48>;
4650
interrupt-parent = <&gpio7>;
4751
interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
52+
label = "somelabel";
4853
vcc-supply = <&supply>;
4954
#thermal-sensor-cells = <1>;
5055
};

Documentation/devicetree/bindings/trivial-devices.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,20 @@ properties:
293293
- mps,mp2856
294294
# Monolithic Power Systems Inc. multi-phase controller mp2857
295295
- mps,mp2857
296+
# Monolithic Power Systems Inc. multi-phase controller mp2869
297+
- mps,mp2869
296298
# Monolithic Power Systems Inc. multi-phase controller mp2888
297299
- mps,mp2888
298300
# Monolithic Power Systems Inc. multi-phase controller mp2891
299301
- mps,mp2891
302+
# Monolithic Power Systems Inc. multi-phase controller mp29502
303+
- mps,mp29502
304+
# Monolithic Power Systems Inc. multi-phase controller mp29608
305+
- mps,mp29608
306+
# Monolithic Power Systems Inc. multi-phase controller mp29612
307+
- mps,mp29612
308+
# Monolithic Power Systems Inc. multi-phase controller mp29816
309+
- mps,mp29816
300310
# Monolithic Power Systems Inc. multi-phase controller mp2993
301311
- mps,mp2993
302312
# Monolithic Power Systems Inc. hot-swap protection device
@@ -305,6 +315,8 @@ properties:
305315
- mps,mp5920
306316
# Monolithic Power Systems Inc. multi-phase hot-swap controller mp5990
307317
- mps,mp5990
318+
# Monolithic Power Systems Inc. multi-phase hot-swap controller mp5998
319+
- mps,mp5998
308320
# Monolithic Power Systems Inc. digital step-down converter mp9941
309321
- mps,mp9941
310322
# Temperature sensor with integrated fan control
@@ -362,6 +374,9 @@ properties:
362374
# Sensirion low power multi-pixel gas sensor with I2C interface
363375
- sensirion,sgpc3
364376
# Sensirion temperature & humidity sensor with I2C interface
377+
- sensirion,sht20
378+
- sensirion,sht21
379+
- sensirion,sht25
365380
- sensirion,sht4x
366381
# Sensortek 3 axis accelerometer
367382
- sensortek,stk8312

0 commit comments

Comments
 (0)