Skip to content

Commit 500a711

Browse files
committed
Merge tag 'hwmon-for-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck: "Obsolete driver removals: - Removed obsolete adm1021 and max6642 drivers New drivers: - MPS MP2891, MP2993, MP9941, and MP5920 - SPD5118 (Temperature Sensor and EEPROM) Added device support to existing drivers: - g762: G761 - dell-smm: Dell OptiPlex 7060 - asus-ec-sensors: ProArt X670E-CREATOR WIFI - corsair-psu: HX1200i Series 2023 psu - nzxt-smart2: Additional USB IS for NZXT RGB & Fan Controller Notable enhancements and fixes: - Removed use of i2c_match_id() - Constified struct regmap_config where feasible - Cleaned up amc6821 driver, and converted to use regmap and with_info API - Converted max6639 driver to use with_info API; added support for additional sysfs attributes - Fixed various sysfs attribute underflows - Added PEC support to hwmon core, and use in lm90 and max31827 drivers And various other minor fixes and improvements" * tag 'hwmon-for-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (103 commits) hwmon: (max6697) Fix swapped temp{1,8} critical alarms hwmon: (max6697) Fix underflow when writing limit attributes hwmon: Remove obsolete adm1021 and max6642 drivers hwmon: (pmbus/ltc4286) Drop unused i2c device ids hwmon: (g762) Initialize fans after configuring clock hwmon: (amc6821) Add support for pwm1_mode attribute hwmon: (amc6821) Convert to with_info API hwmon: (amc6821) Convert to use regmap hwmon: (amc6821) Drop unnecessary enum chips hwmon: (amc6821) Use BIT() and GENMASK() hwmon: (amc6821) Use tabs for column alignment in defines hwmon: (amc6821) Reorder include files, drop unnecessary ones hwmon: (amc6821) Add support for fan1_target and pwm1_enable mode 4 hwmon: (amc6821) Rename fan1_div to fan1_pulses hwmon: (amc6821) Make reading and writing fan speed limits consistent hwmon: (amc6821) Stop accepting invalid pwm values hwmon: (w83627ehf) Fix underflows seen when writing limit attributes hwmon: (nct6775-core) Fix underflows seen when writing limit attributes hwmon: (lm95234) Fix underflows seen when writing limit attributes hwmon: (adc128d818) Fix underflows seen when writing limit attributes ...
2 parents e763c9e + 1ea3fd1 commit 500a711

Some content is hidden

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

92 files changed

+4413
-2254
lines changed

Documentation/devicetree/bindings/hwmon/g762.txt

Lines changed: 0 additions & 47 deletions
This file was deleted.
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/gmt,g762.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: GMT G761/G762/G763 PWM Fan controller
8+
9+
maintainers:
10+
- Christian Marangi <[email protected]>
11+
12+
description: |
13+
GMT G761/G762/G763 PWM Fan controller.
14+
15+
G761 supports an internal-clock hence the clocks property is optional.
16+
If not defined, internal-clock will be used. (31KHz is the clock of
17+
the internal crystal oscillator)
18+
19+
If an optional property is not set in DT, then current value is kept
20+
unmodified (e.g. bootloader installed value).
21+
22+
Additional information on operational parameters for the device is available
23+
in Documentation/hwmon/g762.rst. A detailed datasheet for the device is available
24+
at http://natisbad.org/NAS/refs/GMT_EDS-762_763-080710-0.2.pdf.
25+
26+
properties:
27+
compatible:
28+
enum:
29+
- gmt,g761
30+
- gmt,g762
31+
- gmt,g763
32+
33+
reg:
34+
maxItems: 1
35+
36+
clocks:
37+
description: a fixed clock providing input clock frequency on CLK
38+
pin of the chip.
39+
maxItems: 1
40+
41+
fan_startv:
42+
description: Fan startup voltage step
43+
$ref: /schemas/types.yaml#/definitions/uint32
44+
enum: [0, 1, 2, 3]
45+
46+
pwm_polarity:
47+
description: PWM polarity (positive or negative duty)
48+
$ref: /schemas/types.yaml#/definitions/uint32
49+
enum: [0, 1]
50+
51+
fan_gear_mode:
52+
description: FAN gear mode. Configure High speed fan setting factor
53+
$ref: /schemas/types.yaml#/definitions/uint32
54+
enum: [0, 1, 2]
55+
56+
required:
57+
- compatible
58+
- reg
59+
60+
if:
61+
properties:
62+
compatible:
63+
contains:
64+
enum:
65+
- gmt,g762
66+
- gmt,g763
67+
then:
68+
required:
69+
- clocks
70+
71+
additionalProperties: false
72+
73+
examples:
74+
- |
75+
i2c {
76+
#address-cells = <1>;
77+
#size-cells = <0>;
78+
79+
g762@3e {
80+
compatible = "gmt,g762";
81+
reg = <0x3e>;
82+
clocks = <&g762_clk>;
83+
fan_gear_mode = <0>;
84+
fan_startv = <1>;
85+
pwm_polarity = <0>;
86+
};
87+
88+
g761@1e {
89+
compatible = "gmt,g761";
90+
reg = <0x1e>;
91+
fan_gear_mode = <0>;
92+
fan_startv = <1>;
93+
pwm_polarity = <0>;
94+
};
95+
};
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
5+
$id: http://devicetree.org/schemas/hwmon/maxim,max6639.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Maxim max6639
9+
10+
maintainers:
11+
- Naresh Solanki <[email protected]>
12+
13+
description: |
14+
The MAX6639 is a 2-channel temperature monitor with dual, automatic, PWM
15+
fan-speed controller. It monitors its own temperature and one external
16+
diode-connected transistor or the temperatures of two external diode-connected
17+
transistors, typically available in CPUs, FPGAs, or GPUs.
18+
19+
Datasheets:
20+
https://datasheets.maximintegrated.com/en/ds/MAX6639-MAX6639F.pdf
21+
22+
properties:
23+
compatible:
24+
enum:
25+
- maxim,max6639
26+
27+
reg:
28+
maxItems: 1
29+
30+
'#address-cells':
31+
const: 1
32+
33+
'#size-cells':
34+
const: 0
35+
36+
'#pwm-cells':
37+
const: 3
38+
39+
required:
40+
- compatible
41+
- reg
42+
43+
patternProperties:
44+
"^fan@[0-1]$":
45+
type: object
46+
description:
47+
Represents the two fans and their specific configuration.
48+
49+
$ref: fan-common.yaml#
50+
51+
unevaluatedProperties: false
52+
53+
properties:
54+
reg:
55+
description:
56+
The fan number.
57+
58+
required:
59+
- reg
60+
61+
additionalProperties: false
62+
63+
examples:
64+
- |
65+
i2c {
66+
#address-cells = <1>;
67+
#size-cells = <0>;
68+
69+
fan1: fan-controller@10 {
70+
compatible = "maxim,max6639";
71+
reg = <0x10>;
72+
#address-cells = <1>;
73+
#size-cells = <0>;
74+
#pwm-cells = <3>;
75+
76+
fan@0 {
77+
reg = <0x0>;
78+
pulses-per-revolution = <2>;
79+
max-rpm = <4000>;
80+
target-rpm = <1000>;
81+
pwms = <&fan1 0 25000 0>;
82+
};
83+
84+
fan@1 {
85+
reg = <0x1>;
86+
pulses-per-revolution = <2>;
87+
max-rpm = <8000>;
88+
pwms = <&fan1 1 25000 0>;
89+
};
90+
};
91+
};
92+
...

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@ properties:
6666
description: phandle to the regulator that provides the VS supply typically
6767
in range from 2.7 V to 5.5 V.
6868

69+
ti,alert-polarity-active-high:
70+
description: Alert pin is asserted based on the value of Alert polarity Bit
71+
of Mask/Enable register. Default value is Normal (0 which maps to
72+
active-low open collector). The other value is Inverted
73+
(1 which maps to active-high open collector). Specify this property to set
74+
the alert polarity to active-high.
75+
$ref: /schemas/types.yaml#/definitions/flag
76+
6977
required:
7078
- compatible
7179
- reg
@@ -88,5 +96,6 @@ examples:
8896
label = "vdd_3v0";
8997
shunt-resistor = <1000>;
9098
vs-supply = <&vdd_3v0>;
99+
ti,alert-polarity-active-high;
91100
};
92101
};

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ title: TMP108 temperature sensor
99
maintainers:
1010
- Krzysztof Kozlowski <[email protected]>
1111

12+
description: |
13+
The TMP108 is a digital-output temperature sensor with a
14+
dynamically-programmable limit window, and under- and overtemperature
15+
alert functions.
16+
17+
Datasheets:
18+
https://www.ti.com/product/TMP108
19+
1220
properties:
1321
compatible:
1422
enum:
@@ -24,6 +32,9 @@ properties:
2432
"#thermal-sensor-cells":
2533
const: 0
2634

35+
vcc-supply:
36+
description: phandle to the regulator that provides the V+ supply
37+
2738
required:
2839
- compatible
2940
- reg
@@ -45,6 +56,7 @@ examples:
4556
interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
4657
pinctrl-names = "default";
4758
pinctrl-0 = <&tmp_alrt>;
59+
vcc-supply = <&supply>;
4860
#thermal-sensor-cells = <0>;
4961
};
5062
};

Documentation/devicetree/bindings/trivial-devices.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ properties:
168168
- isil,isl69269
169169
# Intersil ISL76682 Ambient Light Sensor
170170
- isil,isl76682
171+
# JEDEC JESD300 (SPD5118) Hub and Serial Presence Detect
172+
- jedec,spd5118
171173
# Linear Technology LTC2488
172174
- lineartechnology,ltc2488
173175
# 5 Bit Programmable, Pulse-Width Modulator
@@ -286,14 +288,22 @@ properties:
286288
- mps,mp2857
287289
# Monolithic Power Systems Inc. multi-phase controller mp2888
288290
- mps,mp2888
291+
# Monolithic Power Systems Inc. multi-phase controller mp2891
292+
- mps,mp2891
289293
# Monolithic Power Systems Inc. multi-phase controller mp2971
290294
- mps,mp2971
291295
# Monolithic Power Systems Inc. multi-phase controller mp2973
292296
- mps,mp2973
293297
# Monolithic Power Systems Inc. multi-phase controller mp2975
294298
- mps,mp2975
299+
# Monolithic Power Systems Inc. multi-phase controller mp2993
300+
- mps,mp2993
301+
# Monolithic Power Systems Inc. multi-phase hot-swap controller mp5920
302+
- mps,mp5920
295303
# Monolithic Power Systems Inc. multi-phase hot-swap controller mp5990
296304
- mps,mp5990
305+
# Monolithic Power Systems Inc. digital step-down converter mp9941
306+
- mps,mp9941
297307
# Monolithic Power Systems Inc. synchronous step-down converter mpq8785
298308
- mps,mpq8785
299309
# Temperature sensor with integrated fan control

0 commit comments

Comments
 (0)