Skip to content

Commit 2b5d5f2

Browse files
torvaldstorvalds
committed
Merge tag 'hwmon-for-v6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hmon updates from Guenter Roeck: "New drivers: - ISL28022 power monitor - Nuvoton NCT7363Y Added support for new chips to existing drivers: - The tmp180 driver now supports NXP p3t1085, including its I3C mode - The ina2xx driver now supports SY24655 and INA260 - The amc6821 driver now supports tsd,mule Other notable improvements: - The sht4x driver now supports the chip heater - The pmbus/isl68137 driver now supports a voltage divider on Vout - The cros_ec driver registers with the thermal framework - The pmbus/ltc2978 driver now supports LTC7841 - The PMBus core now allow drivers to override WRITE_PROTECT Various other minor improvements and cleanups" * tag 'hwmon-for-v6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (51 commits) hwmon: (pmbus/isl68137) add support for voltage divider on Vout dt-bindings: hwmon: isl68137: add bindings to support voltage dividers hwmon: tmp108: fix I3C dependency hwmon: (cros_ec) register thermal sensors to thermal framework hwmon: (tmp108) Add support for I3C device hwmon: (tmp108) Add helper function tmp108_common_probe() to prepare I3C support hwmon: (acpi_power_meter) Fix fail to load module on platform without _PMD method hwmon: (nct6775-core) Fix overflows seen when writing limit attributes hwmon: (pwm-fan) Introduce start from stopped state handling dt-bindings: hwmon: pwm-fan: Document start from stopped state properties hwmon: (tmp108) Add NXP p3t1085 support dt-bindings: hwmon: ti,tmp108: Add nxp,p3t1085 compatible string hwmon: (sch5627, max31827) Fix typos in driver documentation hwmon: (jc42) Drop of_match_ptr() protection hwmon: (f71882fg) Fix grammar in fan speed trip points explanation dt-bindings: hwmon: pmbus: add ti tps25990 support hwmon: (pmbus/core) clear faults after setting smbalert mask hwmon: (pmbus/core) allow drivers to override WRITE_PROTECT hwmon: (pmbus) add documentation for existing flags hwmon: (ina226) Add support for SY24655 ...
2 parents 4e9ad03 + 3996187 commit 2b5d5f2

85 files changed

Lines changed: 2620 additions & 250 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/lltc,ltc2978.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
- lltc,ltc3886
2727
- lltc,ltc3887
2828
- lltc,ltc3889
29+
- lltc,ltc7841
2930
- lltc,ltc7880
3031
- lltc,ltm2987
3132
- lltc,ltm4664
@@ -50,6 +51,7 @@ properties:
5051
* ltc2977, ltc2979, ltc2980, ltm2987 : vout0 - vout7
5152
* ltc2978 : vout0 - vout7
5253
* ltc3880, ltc3882, ltc3884, ltc3886, ltc3887, ltc3889 : vout0 - vout1
54+
* ltc7841 : vout0
5355
* ltc7880 : vout0 - vout1
5456
* ltc3883 : vout0
5557
* ltm4664 : vout0 - vout1

‎Documentation/devicetree/bindings/hwmon/nuvoton,nct7363.yaml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
5+
$id: http://devicetree.org/schemas/hwmon/nuvoton,nct7363.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Nuvoton NCT7363Y Hardware Monitoring IC
9+
10+
maintainers:
11+
- Ban Feng <kcfeng0@nuvoton.com>
12+
13+
description: |
14+
The NCT7363Y is a fan controller which provides up to 16 independent
15+
FAN input monitors, and up to 16 independent PWM outputs with SMBus interface.
16+
17+
Datasheets: Available from Nuvoton upon request
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- nuvoton,nct7363
23+
- nuvoton,nct7362
24+
25+
reg:
26+
maxItems: 1
27+
28+
"#pwm-cells":
29+
const: 2
30+
31+
patternProperties:
32+
"^fan-[0-9]+$":
33+
$ref: fan-common.yaml#
34+
unevaluatedProperties: false
35+
required:
36+
- pwms
37+
- tach-ch
38+
39+
required:
40+
- compatible
41+
- reg
42+
- "#pwm-cells"
43+
44+
additionalProperties: false
45+
46+
examples:
47+
- |
48+
i2c {
49+
#address-cells = <1>;
50+
#size-cells = <0>;
51+
52+
hwmon: hwmon@22 {
53+
compatible = "nuvoton,nct7363";
54+
reg = <0x22>;
55+
#pwm-cells = <2>;
56+
57+
fan-0 {
58+
pwms = <&hwmon 0 50000>;
59+
tach-ch = /bits/ 8 <0x00>;
60+
};
61+
fan-1 {
62+
pwms = <&hwmon 1 50000>;
63+
tach-ch = /bits/ 8 <0x01>;
64+
};
65+
};
66+
};

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

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
5+
$id: http://devicetree.org/schemas/hwmon/pmbus/isil,isl68137.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Renesas Digital Multiphase Voltage Regulators with PMBus
9+
10+
maintainers:
11+
- Grant Peltier <grant.peltier.jg@renesas.com>
12+
13+
description: |
14+
Renesas digital multiphase voltage regulators with PMBus.
15+
https://www.renesas.com/en/products/power-management/multiphase-power/multiphase-dcdc-switching-controllers
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- isil,isl68137
21+
- renesas,isl68220
22+
- renesas,isl68221
23+
- renesas,isl68222
24+
- renesas,isl68223
25+
- renesas,isl68224
26+
- renesas,isl68225
27+
- renesas,isl68226
28+
- renesas,isl68227
29+
- renesas,isl68229
30+
- renesas,isl68233
31+
- renesas,isl68239
32+
- renesas,isl69222
33+
- renesas,isl69223
34+
- renesas,isl69224
35+
- renesas,isl69225
36+
- renesas,isl69227
37+
- renesas,isl69228
38+
- renesas,isl69234
39+
- renesas,isl69236
40+
- renesas,isl69239
41+
- renesas,isl69242
42+
- renesas,isl69243
43+
- renesas,isl69247
44+
- renesas,isl69248
45+
- renesas,isl69254
46+
- renesas,isl69255
47+
- renesas,isl69256
48+
- renesas,isl69259
49+
- isil,isl69260
50+
- renesas,isl69268
51+
- isil,isl69269
52+
- renesas,isl69298
53+
- renesas,raa228000
54+
- renesas,raa228004
55+
- renesas,raa228006
56+
- renesas,raa228228
57+
- renesas,raa229001
58+
- renesas,raa229004
59+
60+
reg:
61+
maxItems: 1
62+
63+
'#address-cells':
64+
const: 1
65+
66+
'#size-cells':
67+
const: 0
68+
69+
patternProperties:
70+
"^channel@([0-3])$":
71+
type: object
72+
description:
73+
Container for properties specific to a particular channel (rail).
74+
75+
properties:
76+
reg:
77+
description: The channel (rail) index.
78+
items:
79+
minimum: 0
80+
maximum: 3
81+
82+
vout-voltage-divider:
83+
description: |
84+
Resistances of a voltage divider placed between Vout and the voltage
85+
sense (Vsense) pin for the given channel (rail). It has two numbers
86+
representing the resistances of the voltage divider provided as
87+
<Rout Rtotal> which yields an adjusted Vout as
88+
Vout_adj = Vout * Rtotal / Rout given the original Vout as reported
89+
by the Vsense pin. Given a circuit configuration similar to the one
90+
below, Rtotal = R1 + Rout.
91+
92+
Vout ----.
93+
|
94+
.-----.
95+
| R1 |
96+
'-----'
97+
|
98+
+---- Vsense
99+
|
100+
.-----.
101+
| Rout|
102+
'-----'
103+
|
104+
GND
105+
106+
$ref: /schemas/types.yaml#/definitions/uint32-array
107+
minItems: 2
108+
maxItems: 2
109+
110+
required:
111+
- reg
112+
113+
additionalProperties: false
114+
115+
required:
116+
- compatible
117+
- reg
118+
119+
additionalProperties: false
120+
121+
examples:
122+
- |
123+
i2c {
124+
#address-cells = <1>;
125+
#size-cells = <0>;
126+
127+
isl68239@60 {
128+
compatible = "isil,isl68137";
129+
reg = <0x60>;
130+
};
131+
};
132+
- |
133+
i2c {
134+
#address-cells = <1>;
135+
#size-cells = <0>;
136+
137+
isl68239@60 {
138+
compatible = "renesas,isl68239";
139+
reg = <0x60>;
140+
#address-cells = <1>;
141+
#size-cells = <0>;
142+
143+
channel@0 {
144+
reg = <0>;
145+
vout-voltage-divider = <1000 2000>; // Reported Vout/Pout would be scaled by 2
146+
};
147+
};
148+
};

‎Documentation/devicetree/bindings/hwmon/pmbus/mps,mp2975.yaml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/pmbus/mps,mp2975.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MPS MP2975 Synchronous Buck Regulator
8+
9+
maintainers:
10+
- Naresh Solanki <naresh.solanki@9elements.com>
11+
12+
description:
13+
The MPS MP2971, MP2973 & MP2975 is a multi-phase voltage regulator
14+
designed for use in high-performance computing and server
15+
applications. It supports I2C/PMBus for control and monitoring.
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- mps,mp2971
21+
- mps,mp2973
22+
- mps,mp2975
23+
24+
reg:
25+
maxItems: 1
26+
27+
interrupts:
28+
maxItems: 1
29+
30+
regulators:
31+
type: object
32+
description:
33+
List of regulators provided by this controller.
34+
35+
patternProperties:
36+
"^vout[0-1]$":
37+
$ref: /schemas/regulator/regulator.yaml#
38+
type: object
39+
unevaluatedProperties: false
40+
41+
additionalProperties: false
42+
43+
required:
44+
- compatible
45+
- reg
46+
47+
additionalProperties: false
48+
49+
examples:
50+
- |
51+
#include <dt-bindings/interrupt-controller/irq.h>
52+
i2c {
53+
#address-cells = <1>;
54+
#size-cells = <0>;
55+
56+
regulator@58 {
57+
compatible = "mps,mp2973";
58+
reg = <0x58>;
59+
60+
interrupt-parent = <&smb_pex_cpu1_event>;
61+
interrupts = <12 IRQ_TYPE_LEVEL_LOW>;
62+
63+
regulators {
64+
vout0 {
65+
regulator-name = "pvccin_cpu1";
66+
regulator-enable-ramp-delay = <200>;
67+
};
68+
vout1 {
69+
regulator-name = "pvccfa_ehv_fivra_cpu1";
70+
regulator-enable-ramp-delay = <200>;
71+
};
72+
};
73+
};
74+
};
75+

‎Documentation/devicetree/bindings/hwmon/pmbus/ti,tps25990.yaml‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
5+
$id: http://devicetree.org/schemas/hwmon/pmbus/ti,tps25990.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Texas Instruments TPS25990 Stackable eFuse
9+
10+
maintainers:
11+
- Jerome Brunet <jbrunet@baylibre.com>
12+
13+
description:
14+
The TI TPS25990 is an integrated, high-current circuit
15+
protection and power management device with PMBUS interface
16+
17+
properties:
18+
compatible:
19+
const: ti,tps25990
20+
21+
reg:
22+
maxItems: 1
23+
24+
ti,rimon-micro-ohms:
25+
description:
26+
micro Ohms value of the resistance installed between the Imon pin
27+
and the ground reference.
28+
29+
interrupts:
30+
description: PMBUS SMB Alert Interrupt.
31+
maxItems: 1
32+
33+
regulators:
34+
type: object
35+
description:
36+
list of regulators provided by this controller.
37+
38+
properties:
39+
vout:
40+
$ref: /schemas/regulator/regulator.yaml#
41+
type: object
42+
unevaluatedProperties: false
43+
44+
gpdac1:
45+
$ref: /schemas/regulator/regulator.yaml#
46+
type: object
47+
unevaluatedProperties: false
48+
49+
gpdac2:
50+
$ref: /schemas/regulator/regulator.yaml#
51+
type: object
52+
unevaluatedProperties: false
53+
additionalProperties: false
54+
55+
required:
56+
- compatible
57+
- reg
58+
- ti,rimon-micro-ohms
59+
60+
additionalProperties: false
61+
62+
examples:
63+
- |
64+
#include <dt-bindings/interrupt-controller/irq.h>
65+
i2c {
66+
#address-cells = <1>;
67+
#size-cells = <0>;
68+
69+
hw-monitor@46 {
70+
compatible = "ti,tps25990";
71+
reg = <0x46>;
72+
73+
interrupt-parent = <&gpio>;
74+
interrupts = <42 IRQ_TYPE_LEVEL_LOW>;
75+
ti,rimon-micro-ohms = <1370000000>;
76+
77+
regulators {
78+
cpu0_vout: vout {
79+
regulator-name = "main_cpu0";
80+
};
81+
};
82+
};
83+
};

0 commit comments

Comments
 (0)