Skip to content

Commit 02892f9

Browse files
committed
Merge tag 'hwmon-for-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck: "New drivers: - Apple Silicon SMC - TSC1641 I2C power monitor - MPS MP9945 - MAX17616 - MP2925 and MP2929 Added support for new devices to existing drivers: - dell-smm: Add Dell G5 5505 to fan control whitelist - aspeed-g6-pwm-tach: Support for AST2700 - asus-ec-sensors: Support for ROG STRIX X470-I GAMING, ROG STRIX X870-F GAMING WIFI, ROG STRIX X870E-H GAMING WIFI7, and Pro WS TRX50-SAGE WIFI - k10temp: Support for AMD Steam Deck APU ID - pmbus/isl68137: Support for raa229141 - aht10: Support for dht20 - adt7410: Support for ADT7422 - peci: Support for Intel Emerald Rapids - nct6775: Support for ASUS ROG STRIX X870E-H GAMING WIFI7 - pmbus/max34440: Support for ADPM12200 - ntc-thermistor: Support for Murata ncp18wm474 Infrastructure updates: - Utilize subsystem locking in various drivers - ltc4282, ltc2947: Use the new energy64 attribute Bug fixes: - Various drivers: Fixes to avoid TOCTOU, mostly in macro functions evaluating parameters multiple times, as well as missing locks - max6697: Fix regmap leak on probe failure - sy7636a: Fix regulator_enable resource leak on error path - asus-ec-sensors: Correct Pro WS TRX50-SAGE WIFI entry Other changes and improvements: - w83781d, lm78: Drop REALLY_SLOW_IO - Fix broken datasheet links in various drivers And various other minor fixes and improvements" * tag 'hwmon-for-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (110 commits) hwmon: (dell-smm) Add Dell G5 5505 to fan control whitelist hwmon: (max16065) Use local variable to avoid TOCTOU hwmon: (w83l786ng) Convert macros to functions to avoid TOCTOU hwmon: (max6697) fix regmap leak on probe failure hwmon/w83781d: Drop REALLY_SLOW_IO setting hwmon/lm78: Drop REALLY_SLOW_IO setting hwmon: sy7636a: Fix regulator_enable resource leak on error path hwmon: (adm1026) Convert macros to functions to avoid TOCTOU hwmon: (adm1029) Add locking to avoid TOCTOU hwmon: (lm87) Convert macros to functions to avoid TOCTOU hwmon: (asus-ec-sensors) correct Pro WS TRX50-SAGE WIFI entry hwmon: (vt8231) Convert macros to functions to avoid TOCTOU hwmon: (emc2103) Add locking to avoid TOCTOU hwmon: (aspeed-g6-pwm-tach): Add AST2700 compatible string dt-bindings: hwmon: Add AST2700 compatible hwmon: (asus-ec-sensors) add ROG STRIX X470-I GAMING hwmon: (vt1211) Convert macros to functions to avoid TOCTOU hwmon: (k10temp) Add AMD Steam Deck APU ID hwmon: Add Apple Silicon SMC hwmon driver Documentation/hwmon: Fix broken datasheet links for zl6100 ...
2 parents fca5327 + 30ca0e0 commit 02892f9

129 files changed

Lines changed: 3852 additions & 1284 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
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/apm,xgene-slimpro-hwmon.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: APM X-Gene SLIMpro hwmon
8+
9+
maintainers:
10+
- Khuong Dinh <khuong@os.amperecomputing.com>
11+
12+
properties:
13+
compatible:
14+
const: apm,xgene-slimpro-hwmon
15+
16+
mboxes:
17+
maxItems: 1
18+
19+
required:
20+
- compatible
21+
- mboxes
22+
23+
additionalProperties: false
24+
25+
examples:
26+
- |
27+
hwmon {
28+
compatible = "apm,xgene-slimpro-hwmon";
29+
mboxes = <&mailbox 7>;
30+
};

Documentation/devicetree/bindings/hwmon/apm-xgene-hwmon.txt

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

Documentation/devicetree/bindings/hwmon/aspeed,g6-pwm-tach.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ description: |
1818
1919
properties:
2020
compatible:
21-
enum:
22-
- aspeed,ast2600-pwm-tach
21+
oneOf:
22+
- items:
23+
- const: aspeed,ast2700-pwm-tach
24+
- const: aspeed,ast2600-pwm-tach
25+
- const: aspeed,ast2600-pwm-tach
2326

2427
reg:
2528
maxItems: 1

Documentation/devicetree/bindings/hwmon/max31785.txt

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

Documentation/devicetree/bindings/hwmon/maxim,max31790.yaml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ description: >
2020
2121
properties:
2222
compatible:
23-
const: maxim,max31790
23+
enum:
24+
- maxim,max31785
25+
- maxim,max31785a
26+
- maxim,max31785b
27+
- maxim,max31790
2428

2529
reg:
2630
maxItems: 1
@@ -31,11 +35,17 @@ properties:
3135
resets:
3236
maxItems: 1
3337

38+
'#address-cells':
39+
const: 1
40+
41+
'#size-cells':
42+
const: 0
43+
3444
"#pwm-cells":
3545
const: 1
3646

3747
patternProperties:
38-
"^fan-[0-9]+$":
48+
"^fan@[0-9]+$":
3949
$ref: fan-common.yaml#
4050
unevaluatedProperties: false
4151

@@ -56,13 +66,17 @@ examples:
5666
reg = <0x20>;
5767
clocks = <&sys_clk>;
5868
resets = <&reset 0>;
69+
#address-cells = <1>;
5970
#pwm-cells = <1>;
71+
#size-cells = <0>;
6072
61-
fan-0 {
73+
fan@0 {
74+
reg = <0x0>;
6275
pwms = <&pwm_provider 1>;
6376
};
6477
65-
fan-1 {
78+
fan@1 {
79+
reg = <0x1>;
6680
pwms = <&pwm_provider 2>;
6781
};
6882
};

Documentation/devicetree/bindings/hwmon/ntc-thermistor.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ properties:
7575
- const: murata,ncp15wl333
7676
- const: murata,ncp03wf104
7777
- const: murata,ncp15xh103
78+
- const: murata,ncp18wm474
7879
- const: samsung,1404-001221
7980
# Deprecated "ntc," compatible strings
8081
- const: ntc,ncp15wb473
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-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/pmbus/adi,max17616.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Analog Devices MAX17616/MAX17616A Current-Limiter with PMBus Interface
8+
9+
maintainers:
10+
- Kim Seer Paller <kimseer.paller@analog.com>
11+
12+
description: |
13+
The MAX17616/MAX17616A is a 3V to 80V, 7A current-limiter with overvoltage,
14+
surge, undervoltage, reverse polarity, and loss of ground protection. It allows
15+
monitoring of input/output voltage, output current and temperature through the
16+
PMBus serial interface.
17+
Datasheet:
18+
https://www.analog.com/en/products/max17616.html
19+
20+
properties:
21+
compatible:
22+
const: adi,max17616
23+
24+
reg:
25+
maxItems: 1
26+
27+
vcc-supply: true
28+
29+
interrupts:
30+
description: Fault condition signal provided on SMBALERT pin.
31+
maxItems: 1
32+
33+
required:
34+
- compatible
35+
- reg
36+
- vcc-supply
37+
38+
additionalProperties: false
39+
40+
examples:
41+
- |
42+
i2c {
43+
#address-cells = <1>;
44+
#size-cells = <0>;
45+
46+
hwmon@16 {
47+
compatible = "adi,max17616";
48+
reg = <0x16>;
49+
vcc-supply = <&vcc>;
50+
};
51+
};
52+
...
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/st,tsc1641.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: ST Microelectronics TSC1641 I2C power monitor
8+
9+
maintainers:
10+
- Igor Reznichenko <igor@reznichenko.net>
11+
12+
description: |
13+
TSC1641 is a 60 V, 16-bit high-precision power monitor with I2C and
14+
MIPI I3C interface
15+
16+
Datasheets:
17+
https://www.st.com/resource/en/datasheet/tsc1641.pdf
18+
19+
properties:
20+
compatible:
21+
const: st,tsc1641
22+
23+
reg:
24+
maxItems: 1
25+
26+
interrupts:
27+
description: Optional alert interrupt.
28+
maxItems: 1
29+
30+
shunt-resistor-micro-ohms:
31+
description: Shunt resistor value in micro-ohms. Since device has internal
32+
16-bit RSHUNT register with 10 uOhm LSB, the maximum value is capped at
33+
655.35 mOhm.
34+
minimum: 100
35+
default: 1000
36+
maximum: 655350
37+
38+
st,alert-polarity-active-high:
39+
$ref: /schemas/types.yaml#/definitions/flag
40+
description: Default value is 0 which configures the normal polarity of the
41+
ALERT pin, being active low open-drain. Setting this to 1 configures the
42+
polarity of the ALERT pin to be inverted and active high open-drain.
43+
Specify this property to set the alert polarity to active-high.
44+
45+
required:
46+
- compatible
47+
- reg
48+
49+
additionalProperties: false
50+
51+
examples:
52+
- |
53+
i2c {
54+
#address-cells = <1>;
55+
#size-cells = <0>;
56+
57+
power-sensor@40 {
58+
compatible = "st,tsc1641";
59+
reg = <0x40>;
60+
shunt-resistor-micro-ohms = <1000>;
61+
st,alert-polarity-active-high;
62+
};
63+
};

Documentation/devicetree/bindings/trivial-devices.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,14 @@ properties:
4343
- adi,ad5110
4444
# Temperature sensor with integrated fan control
4545
- adi,adm1027
46+
# Analog Devices ADT7410 High Accuracy Digital Temperature Sensor
47+
- adi,adt7410
4648
# Analog Devices ADT7411 Temperature Sensor and 8-channel ADC
4749
- adi,adt7411
50+
# Analog Devices ADT7420 High Accuracy Digital Temperature Sensor
51+
- adi,adt7420
52+
# Analog Devices ADT7422 High Accuracy Digital Temperature Sensor
53+
- adi,adt7422
4854
# Temperature sensor with integrated fan control
4955
- adi,adt7463
5056
# Temperature sensor with integrated fan control
@@ -299,6 +305,10 @@ properties:
299305
- mps,mp2888
300306
# Monolithic Power Systems Inc. multi-phase controller mp2891
301307
- mps,mp2891
308+
# Monolithic Power Systems Inc. multi-phase controller mp2925
309+
- mps,mp2925
310+
# Monolithic Power Systems Inc. multi-phase controller mp2929
311+
- mps,mp2929
302312
# Monolithic Power Systems Inc. multi-phase controller mp29502
303313
- mps,mp29502
304314
# Monolithic Power Systems Inc. multi-phase controller mp29608
@@ -319,6 +329,8 @@ properties:
319329
- mps,mp5998
320330
# Monolithic Power Systems Inc. digital step-down converter mp9941
321331
- mps,mp9941
332+
# Monolithic Power Systems Inc. digital step-down converter mp9945
333+
- mps,mp9945
322334
# Temperature sensor with integrated fan control
323335
- national,lm63
324336
# Temperature sensor with integrated fan control

Documentation/hwmon/aht10.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ Supported chips:
2020

2121
English: http://www.aosong.com/userfiles/files/media/Data%20Sheet%20AHT20.pdf
2222

23+
* Aosong DHT20
24+
25+
Prefix: 'dht20'
26+
27+
Addresses scanned: None
28+
29+
Datasheet: https://www.digikey.co.nz/en/htmldatasheets/production/9184855/0/0/1/101020932
30+
2331
Author: Johannes Cornelis Draaijer <jcdra1@gmail.com>
2432

2533

@@ -33,7 +41,7 @@ The address of this i2c device may only be 0x38
3341
Special Features
3442
----------------
3543

36-
AHT20 has additional CRC8 support which is sent as the last byte of the sensor
44+
AHT20, DHT20 has additional CRC8 support which is sent as the last byte of the sensor
3745
values.
3846

3947
Usage Notes

0 commit comments

Comments
 (0)