Skip to content

Commit be413ec

Browse files
committed
Merge tag 'hwmon-for-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck: "Updated chip support in existing drivers: - ina238: Support for INA228 - pmbus/tps53679: Support for TPS53685 - pmbus/adp1050: Support for adp1051, adp1055 and ltp8800 - corsair-psu: Support for HX1200i Series 2025 - pmbus/isl68137: Support for RAA229621 - asus-ec-sensors: Support for ProArt X870E-CREATOR WIFI and Other notable changes: - adt7475: Support for #pwm-cells = <3> - amc6821: Cooling device support - emc2305: Support for PWM frequency, polarity and output - Add missing compatible entries to various devicetree bindings And various other minor fixes and improvements" * tag 'hwmon-for-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (34 commits) dt-bindings: hwmon: Replace bouncing Alexandru Tachici emails hwmon: (ina238) Add support for INA228 dt-bindings: Add INA228 to ina2xx devicetree bindings hwmon: (ina238) Fix inconsistent whitespace dt-bindings: hwmon: adt7475: Allow and recommend #pwm-cells = <3> hwmon: (adt7475) Implement support for #pwm-cells = <3> hwmon: (pmbus/tps53679) Add support for TPS53685 dt-bindings: trivial: Add tps53685 support hwmon: (pmbus/adp1050) Add regulator support for ltp8800 hwmon: (pmbus/adp1050) Add support for adp1051, adp1055 and ltp8800 dt-bindings: hwmon: pmbus/adp1050: Add adp1051, adp1055 and ltp8800 hwmon: (max31827) use sysfs_emit() in temp1_resolution_show() hwmon: (ltc4282) convert from round_rate() to determine_rate() hwmon: (corsair-psu) add support for HX1200i Series 2025 dt-bindings: hwmon: pmbus: ti,ucd90320: Add missing compatibles dt-bindings: hwmon: maxim,max20730: Add maxim,max20710 compatible dt-bindings: hwmon: lltc,ltc2978: Add lltc,ltc713 compatible dt-bindings: hwmon: ti,lm87: Add adi,adm1024 compatible dt-bindings: hwmon: national,lm90: Add missing Dallas max6654 and onsemi nct72, nct214, and nct218 hwmon: (w83627ehf) make the read-only arrays 'bit' static const ...
2 parents 602a067 + de1fffd commit be413ec

33 files changed

+743
-114
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Analog Devices ADM1266 Cascadable Super Sequencer with Margin
88
Control and Fault Recording
99

1010
maintainers:
11-
- Alexandru Tachici <alexandru.tachici@analog.com>
11+
- Cedric Encarnacion <cedricjustine.encarnacion@analog.com>
1212

1313
description: |
1414
Analog Devices ADM1266 Cascadable Super Sequencer with Margin

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Linear Technology 2992 Power Monitor
88

99
maintainers:
10-
- Alexandru Tachici <alexandru.tachici@analog.com>
10+
- Cedric Encarnacion <cedricjustine.encarnacion@analog.com>
1111

1212
description: |
1313
Linear Technology 2992 Dual Wide Range Power Monitor

Documentation/devicetree/bindings/hwmon/adt7475.yaml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@ properties:
5353
default: 1
5454

5555
"#pwm-cells":
56-
const: 4
56+
oneOf:
57+
- const: 3
58+
- const: 4
59+
deprecated: true
5760
description: |
5861
Number of cells in a PWM specifier.
5962
- 0: The PWM channel
@@ -68,7 +71,7 @@ properties:
6871
- 11363636 (88 Hz)
6972
- 44444 (22 kHz)
7073
- 2: PWM flags 0 or PWM_POLARITY_INVERTED
71-
- 3: The default PWM duty cycle in nanoseconds
74+
- 3: The default PWM duty cycle in nanoseconds, defaults to period.
7275
7376
patternProperties:
7477
"^adi,bypass-attenuator-in[0-4]$":
@@ -124,15 +127,15 @@ examples:
124127
adi,bypass-attenuator-in1 = <0>;
125128
adi,pin10-function = "smbalert#";
126129
adi,pin14-function = "tach4";
127-
#pwm-cells = <4>;
130+
#pwm-cells = <3>;
128131
129-
/* PWMs at 22.5 kHz frequency, 50% duty*/
132+
/* PWMs at 22.5 kHz frequency */
130133
fan-0 {
131-
pwms = <&pwm 0 44444 0 22222>;
134+
pwms = <&pwm 0 44444 0>;
132135
};
133136
134137
fan-1 {
135-
pwms = <&pwm 2 44444 0 22222>;
138+
pwms = <&pwm 2 44444 0>;
136139
};
137140
};
138141
};

Documentation/devicetree/bindings/hwmon/lltc,ltc2978.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ properties:
2828
- lltc,ltc3886
2929
- lltc,ltc3887
3030
- lltc,ltc3889
31+
- lltc,ltc7132
3132
- lltc,ltc7841
3233
- lltc,ltc7880
3334
- lltc,ltm2987
@@ -55,6 +56,7 @@ properties:
5556
* ltc2977, ltc2979, ltc2980, ltm2987 : vout0 - vout7
5657
* ltc2978 : vout0 - vout7
5758
* ltc3880, ltc3882, ltc3884, ltc3886, ltc3887, ltc3889 : vout0 - vout1
59+
* ltc7132 : vout0 - vout1
5860
* ltc7841 : vout0
5961
* ltc7880 : vout0 - vout1
6062
* ltc3883 : vout0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ description: |
2525
properties:
2626
compatible:
2727
enum:
28+
- maxim,max20710
2829
- maxim,max20730
2930
- maxim,max20734
3031
- maxim,max20743

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ properties:
2020
- dallas,max6646
2121
- dallas,max6647
2222
- dallas,max6649
23+
- dallas,max6654
2324
- dallas,max6657
2425
- dallas,max6658
2526
- dallas,max6659
@@ -36,6 +37,9 @@ properties:
3637
- nuvoton,nct7717
3738
- nuvoton,nct7718
3839
- nxp,sa56004
40+
- onnn,nct72
41+
- onnn,nct214
42+
- onnn,nct218
3943
- onnn,nct1008
4044
- ti,tmp451
4145
- ti,tmp461
@@ -118,6 +122,7 @@ allOf:
118122
- dallas,max6646
119123
- dallas,max6647
120124
- dallas,max6649
125+
- dallas,max6654
121126
- dallas,max6657
122127
- dallas,max6658
123128
- dallas,max6659
@@ -139,6 +144,9 @@ allOf:
139144
- adi,adt7461
140145
- adi,adt7461a
141146
- adi,adt7481
147+
- onnn,nct72
148+
- onnn,nct214
149+
- onnn,nct218
142150
- onnn,nct1008
143151
then:
144152
patternProperties:

Documentation/devicetree/bindings/hwmon/pmbus/adi,adp1050.yaml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,27 @@ maintainers:
1010
- Radu Sabau <[email protected]>
1111

1212
description: |
13-
The ADP1050 is used to monitor system voltages, currents and temperatures.
13+
The ADP1050 and similar devices are used to monitor system voltages,
14+
currents, power, and temperatures.
15+
1416
Through the PMBus interface, the ADP1050 targets isolated power supplies
1517
and has four individual monitors for input/output voltage, input current
1618
and temperature.
1719
Datasheet:
1820
https://www.analog.com/en/products/adp1050.html
21+
https://www.analog.com/en/products/adp1051.html
22+
https://www.analog.com/en/products/adp1055.html
23+
https://www.analog.com/en/products/ltp8800-1a.html
24+
https://www.analog.com/en/products/ltp8800-2.html
25+
https://www.analog.com/en/products/ltp8800-4a.html
1926
2027
properties:
2128
compatible:
22-
const: adi,adp1050
29+
enum:
30+
- adi,adp1050
31+
- adi,adp1051
32+
- adi,adp1055
33+
- adi,ltp8800
2334

2435
reg:
2536
maxItems: 1

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ properties:
5656
- renesas,raa228228
5757
- renesas,raa229001
5858
- renesas,raa229004
59+
- renesas,raa229621
5960

6061
reg:
6162
maxItems: 1

Documentation/devicetree/bindings/hwmon/pmbus/ti,ucd90320.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,13 @@ description: |
2323
properties:
2424
compatible:
2525
enum:
26+
- ti,ucd9000
27+
- ti,ucd9090
28+
- ti,ucd90120
29+
- ti,ucd90124
30+
- ti,ucd90160
2631
- ti,ucd90320
32+
- ti,ucd90910
2733

2834
reg:
2935
maxItems: 1

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ properties:
3232
$ref: fan-common.yaml#
3333
unevaluatedProperties: false
3434

35+
properties:
36+
cooling-levels:
37+
description: PWM duty cycle values corresponding to thermal cooling states.
38+
items:
39+
maximum: 255
40+
3541
"#pwm-cells":
3642
const: 2
3743
description: |

0 commit comments

Comments
 (0)