Skip to content

Commit f9a7eda

Browse files
committed
Merge tag 'hwmon-for-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck: "New drivers: - Driver for LTC2991 - Driver for POWER-Z Added chip / system support to existing drivers: - The ina238 driver now also supports INA237 - The asus-ec-sensors driver now supports ROG Crosshair X670E Gene - The aquacomputer_d5next now supports Aquacomputer High Flow USB and MPS Flow - The pmbus/mpq7932 driver now also supports MPQ2286 - The nct6683 now also supports ASRock X670E Taichi Various other minor improvements and fixes: - One patch series to call out is the conversion of hwmon platform drivers to use the platform remove callback returning void" * tag 'hwmon-for-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (69 commits) hwmon: (aquacomputer_d5next) Check if temp sensors of legacy devices are connected hwmon: (aquacomputer_d5next) Add support for Aquacomputer High Flow USB and MPS Flow dt-bindings: hwmon: npcm: Add npcm845 compatible string hwmon: Add driver for ltc2991 dt-bindings: hwmon: ltc2991: add bindings hwmon: (pmbus/max31785) Add delay between bus accesses hwmon: (ina238) add ina237 support dt-bindings: hwmon: ti,ina2xx: add ti,ina237 hwmon: (asus-ec-sensors) add ROG Crosshair X670E Gene. hwmon: (max31827) handle vref regulator hwmon: (ina3221) Add support for channel summation disable dt-bindings: hwmon: ina3221: Add ti,summation-disable dt-bindings: hwmon: ina3221: Convert to json-schema hwmon: (pmbus/mpq7932) Add a support for mpq2286 Power Management IC hwmon: (pmbus/core) Add helper macro to define single pmbus regulator regulator: dt-bindings: Add mps,mpq2286 power-management IC hwmon: (pmbus/mpq7932) Get page count based on chip info dt-bindings: hwmon: Add possible new properties to max31827 bindings hwmon: (max31827) Modify conversion wait time hwmon: (max31827) Make code cleaner ...
2 parents 34aac0a + 0f56413 commit f9a7eda

Some content is hidden

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

69 files changed

+2291
-455
lines changed
Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
5+
$id: http://devicetree.org/schemas/hwmon/adi,ltc2991.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Analog Devices LTC2991 Octal I2C Voltage, Current and Temperature Monitor
9+
10+
maintainers:
11+
- Antoniu Miclaus <antoniu.miclaus@analog.com>
12+
13+
description: |
14+
The LTC2991 is used to monitor system temperatures, voltages and currents.
15+
Through the I2C serial interface, the eight monitors can individually measure
16+
supply voltages and can be paired for differential measurements of current
17+
sense resistors or temperature sensing transistors.
18+
19+
Datasheet:
20+
https://www.analog.com/en/products/ltc2991.html
21+
22+
properties:
23+
compatible:
24+
const: adi,ltc2991
25+
26+
reg:
27+
maxItems: 1
28+
29+
'#address-cells':
30+
const: 1
31+
32+
'#size-cells':
33+
const: 0
34+
35+
vcc-supply: true
36+
37+
patternProperties:
38+
"^channel@[0-3]$":
39+
type: object
40+
description:
41+
Represents the differential/temperature channels.
42+
43+
properties:
44+
reg:
45+
description:
46+
The channel number. LTC2991 can monitor 4 currents/temperatures.
47+
items:
48+
minimum: 0
49+
maximum: 3
50+
51+
shunt-resistor-micro-ohms:
52+
description:
53+
The value of curent sense resistor in micro ohms. Pin configuration is
54+
set for differential input pair.
55+
56+
adi,temperature-enable:
57+
description:
58+
Enables temperature readings. Pin configuration is set for remote
59+
diode temperature measurement.
60+
type: boolean
61+
62+
required:
63+
- reg
64+
65+
allOf:
66+
- if:
67+
required:
68+
- shunt-resistor-micro-ohms
69+
then:
70+
properties:
71+
adi,temperature-enable: false
72+
73+
additionalProperties: false
74+
75+
required:
76+
- compatible
77+
- reg
78+
- vcc-supply
79+
80+
additionalProperties: false
81+
82+
examples:
83+
- |
84+
i2c {
85+
#address-cells = <1>;
86+
#size-cells = <0>;
87+
88+
hwmon@48 {
89+
compatible = "adi,ltc2991";
90+
reg = <0x48>;
91+
vcc-supply = <&vcc>;
92+
};
93+
};
94+
- |
95+
i2c {
96+
#address-cells = <1>;
97+
#size-cells = <0>;
98+
99+
hwmon@48 {
100+
#address-cells = <1>;
101+
#size-cells = <0>;
102+
103+
compatible = "adi,ltc2991";
104+
reg = <0x48>;
105+
vcc-supply = <&vcc>;
106+
107+
channel@0 {
108+
reg = <0x0>;
109+
shunt-resistor-micro-ohms = <100000>;
110+
};
111+
112+
channel@1 {
113+
reg = <0x1>;
114+
shunt-resistor-micro-ohms = <100000>;
115+
};
116+
117+
channel@2 {
118+
reg = <0x2>;
119+
adi,temperature-enable;
120+
};
121+
122+
channel@3 {
123+
reg = <0x3>;
124+
adi,temperature-enable;
125+
};
126+
};
127+
};
128+
...

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

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,68 @@ properties:
3232
Must have values in the interval (1.6V; 3.6V) in order for the device to
3333
function correctly.
3434

35+
adi,comp-int:
36+
description:
37+
If present interrupt mode is used. If not present comparator mode is used
38+
(default).
39+
type: boolean
40+
41+
adi,alarm-pol:
42+
description:
43+
Sets the alarms active state.
44+
- 0 = active low
45+
- 1 = active high
46+
$ref: /schemas/types.yaml#/definitions/uint32
47+
enum: [0, 1]
48+
49+
adi,fault-q:
50+
description:
51+
Select how many consecutive temperature faults must occur before
52+
overtemperature or undertemperature faults are indicated in the
53+
corresponding status bits.
54+
$ref: /schemas/types.yaml#/definitions/uint32
55+
enum: [1, 2, 4, 8]
56+
57+
adi,timeout-enable:
58+
description:
59+
Enables timeout. Bus timeout resets the I2C-compatible interface when SCL
60+
is low for more than 30ms (nominal).
61+
type: boolean
62+
63+
allOf:
64+
- if:
65+
properties:
66+
compatible:
67+
contains:
68+
const: adi,max31829
69+
70+
then:
71+
properties:
72+
adi,alarm-pol:
73+
default: 1
74+
75+
else:
76+
properties:
77+
adi,alarm-pol:
78+
default: 0
79+
80+
- if:
81+
properties:
82+
compatible:
83+
contains:
84+
const: adi,max31827
85+
86+
then:
87+
properties:
88+
adi,fault-q:
89+
default: 1
90+
91+
else:
92+
properties:
93+
adi,fault-q:
94+
default: 4
95+
96+
3597
required:
3698
- compatible
3799
- reg
@@ -49,6 +111,10 @@ examples:
49111
compatible = "adi,max31827";
50112
reg = <0x42>;
51113
vref-supply = <&reg_vdd>;
114+
adi,comp-int;
115+
adi,alarm-pol = <0>;
116+
adi,fault-q = <1>;
117+
adi,timeout-enable;
52118
};
53119
};
54120
...

Documentation/devicetree/bindings/hwmon/ina3221.txt

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

Documentation/devicetree/bindings/hwmon/npcm750-pwm-fan.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
Nuvoton NPCM7xx PWM and Fan Tacho controller device
1+
Nuvoton NPCM PWM and Fan Tacho controller device
22

33
The Nuvoton BMC NPCM7XX supports 8 Pulse-width modulation (PWM)
44
controller outputs and 16 Fan tachometer controller inputs.
55

6+
The Nuvoton BMC NPCM8XX supports 12 Pulse-width modulation (PWM)
7+
controller outputs and 16 Fan tachometer controller inputs.
8+
69
Required properties for pwm-fan node
710
- #address-cells : should be 1.
811
- #size-cells : should be 0.
912
- compatible : "nuvoton,npcm750-pwm-fan" for Poleg NPCM7XX.
13+
: "nuvoton,npcm845-pwm-fan" for Arbel NPCM8XX.
1014
- reg : specifies physical base address and size of the registers.
1115
- reg-names : must contain:
1216
* "pwm" for the PWM registers.
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
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/infineon,tda38640.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Infineon TDA38640 Synchronous Buck Regulator with SVID and I2C
9+
10+
maintainers:
11+
- Naresh Solanki <naresh.solanki@9elements.com>
12+
13+
description: |
14+
The Infineon TDA38640 is a 40A Single-voltage Synchronous Buck
15+
Regulator with SVID and I2C designed for Industrial use.
16+
17+
Datasheet: https://www.infineon.com/dgdl/Infineon-TDA38640-0000-DataSheet-v02_04-EN.pdf?fileId=8ac78c8c80027ecd018042f2337f00c9
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- infineon,tda38640
23+
24+
reg:
25+
maxItems: 1
26+
27+
infineon,en-pin-fixed-level:
28+
description:
29+
Indicates that the chip EN pin is at fixed level or left
30+
unconnected(has internal pull-down).
31+
type: boolean
32+
33+
required:
34+
- compatible
35+
- reg
36+
37+
additionalProperties: false
38+
39+
examples:
40+
- |
41+
i2c {
42+
#address-cells = <1>;
43+
#size-cells = <0>;
44+
45+
tda38640@40 {
46+
compatible = "infineon,tda38640";
47+
reg = <0x40>;
48+
};
49+
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
- ti,ina226
2727
- ti,ina230
2828
- ti,ina231
29+
- ti,ina237
2930
- ti,ina238
3031

3132
reg:

0 commit comments

Comments
 (0)