Skip to content

Commit 15223fd

Browse files
committed
Merge tag 'hwmon-for-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck: "New drivers: - Amphenol ChipCap 2 - ASPEED g6 PWM/Fan tach - Astera Labs PT5161L retimer - ASUS ROG RYUJIN II 360 AIO cooler - LTC4282 - Microsoft Surface devices - MPS MPQ8785 Synchronous Step-Down Converter - NZXT Kraken X and Z series AIO CPU coolers Additional chip support in existing drivers: - Ayaneo Air Plus 7320u (oxp-sensors) - INA260 (ina2xx) - XPS 9315 (dell-smm) - MSI customer ID (nct6683) Devicetree bindings updates: - Common schema for hardware monitoring devices - Common schema for fans - Update chip descriptions to use common schema - Document regulator properties in several drivers - Explicit bindings for infineon buck converters Other improvements: - Replaced rbtree with maple tree register cache in several drivers - Added support for humidity min/max alarm and volatage fault attributes to hwmon core - Dropped non-functional I2C_CLASS_HWMON support for drivers w/o detect() - Dropped obsolete and redundant entried from MAINTAINERS - Cleaned up axi-fan-control and coretemp drivers - Minor fixes and improvements in several other drivers" * tag 'hwmon-for-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (70 commits) hwmon: (dell-smm) Add XPS 9315 to fan control whitelist hwmon: (aspeed-g6-pwm-tacho): Support for ASPEED g6 PWM/Fan tach dt-bindings: hwmon: Support Aspeed g6 PWM TACH Control dt-bindings: hwmon: fan: Add fan binding to schema dt-bindings: hwmon: tda38640: Add interrupt & regulator properties hwmon: (amc6821) add of_match table dt-bindings: hwmon: lm75: use common hwmon schema hwmon: (sis5595) drop unused DIV_TO_REG function dt-bindings: hwmon: reference common hwmon schema dt-bindings: hwmon: lltc,ltc4286: use common hwmon schema dt-bindings: hwmon: adi,adm1275: use common hwmon schema dt-bindings: hwmon: ti,ina2xx: use common hwmon schema dt-bindings: hwmon: add common properties hwmon: (pmbus/ir38064) Use PMBUS_REGULATOR_ONE to declare regulator hwmon: (pmbus/lm25066) Use PMBUS_REGULATOR_ONE to declare regulator hwmon: (pmbus/tda38640) Use PMBUS_REGULATOR_ONE to declare regulator regulator: dt-bindings: promote infineon buck converters to their own binding dt-bindings: hwmon/pmbus: ti,lm25066: document regulators dt-bindings: hwmon: nuvoton,nct6775: Add compatible value for NCT6799 MAINTAINERS: Drop redundant hwmon entries ...
2 parents 69afef4 + 8debe3c commit 15223fd

Some content is hidden

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

89 files changed

+7137
-336
lines changed

Documentation/ABI/testing/sysfs-class-hwmon

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,15 @@ Description:
149149

150150
RW
151151

152+
What: /sys/class/hwmon/hwmonX/inY_fault
153+
Description:
154+
Reports a voltage hard failure (eg: shorted component)
155+
156+
- 1: Failed
157+
- 0: Ok
158+
159+
RO
160+
152161
What: /sys/class/hwmon/hwmonX/cpuY_vid
153162
Description:
154163
CPU core reference voltage.
@@ -968,6 +977,15 @@ Description:
968977

969978
RW
970979

980+
What: /sys/class/hwmon/hwmonX/humidityY_max_alarm
981+
Description:
982+
Maximum humidity detection
983+
984+
- 0: OK
985+
- 1: Maximum humidity detected
986+
987+
RO
988+
971989
What: /sys/class/hwmon/hwmonX/humidityY_max_hyst
972990
Description:
973991
Humidity hysteresis value for max limit.
@@ -987,6 +1005,15 @@ Description:
9871005

9881006
RW
9891007

1008+
What: /sys/class/hwmon/hwmonX/humidityY_min_alarm
1009+
Description:
1010+
Minimum humidity detection
1011+
1012+
- 0: OK
1013+
- 1: Minimum humidity detected
1014+
1015+
RO
1016+
9901017
What: /sys/class/hwmon/hwmonX/humidityY_min_hyst
9911018
Description:
9921019
Humidity hysteresis value for min limit.

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ required:
4646
- compatible
4747
- reg
4848

49-
additionalProperties: false
49+
allOf:
50+
- $ref: hwmon-common.yaml#
51+
52+
unevaluatedProperties: false
5053

5154
examples:
5255
- |

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ properties:
3333
reg:
3434
maxItems: 1
3535

36-
shunt-resistor-micro-ohms:
37-
description:
38-
Shunt resistor value in micro-Ohm.
39-
4036
adi,volt-curr-sample-average:
4137
description: |
4238
Number of samples to be used to report voltage and current values.
@@ -50,6 +46,7 @@ properties:
5046
enum: [1, 2, 4, 8, 16, 32, 64, 128]
5147

5248
allOf:
49+
- $ref: hwmon-common.yaml#
5350
- if:
5451
properties:
5552
compatible:
@@ -107,7 +104,7 @@ required:
107104
- compatible
108105
- reg
109106

110-
additionalProperties: false
107+
unevaluatedProperties: false
111108

112109
examples:
113110
- |

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ required:
3131
- compatible
3232
- reg
3333

34-
additionalProperties: false
34+
allOf:
35+
- $ref: hwmon-common.yaml#
36+
37+
unevaluatedProperties: false
3538

3639
examples:
3740
- |
Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/adi,ltc4282.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Analog Devices LTC4282 I2C High Current Hot Swap Controller over I2C
8+
9+
maintainers:
10+
- Nuno Sa <nuno.sa@analog.com>
11+
12+
description: |
13+
Analog Devices LTC4282 I2C High Current Hot Swap Controller over I2C.
14+
15+
https://www.analog.com/media/en/technical-documentation/data-sheets/ltc4282.pdf
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- adi,ltc4282
21+
22+
reg:
23+
maxItems: 1
24+
25+
vdd-supply: true
26+
27+
clocks:
28+
maxItems: 1
29+
30+
'#clock-cells':
31+
const: 0
32+
33+
adi,rsense-nano-ohms:
34+
description: Value of the sense resistor.
35+
36+
adi,vin-mode-microvolt:
37+
description:
38+
Selects operating range for the Undervoltage, Overvoltage and Foldback
39+
pins. Also for the ADC. Should be set to the nominal input voltage.
40+
enum: [3300000, 5000000, 12000000, 24000000]
41+
default: 12000000
42+
43+
adi,fet-bad-timeout-ms:
44+
description:
45+
From the moment a FET bad conditions is present, this property selects the
46+
wait time/timeout for a FET-bad fault to be signaled. Setting this to 0,
47+
disables FET bad faults to be reported.
48+
default: 255
49+
maximum: 255
50+
51+
adi,overvoltage-dividers:
52+
description: |
53+
Select which dividers to use for VDD Overvoltage detection. Note that
54+
when the internal dividers are used the threshold is referenced to VDD.
55+
The percentages in the datasheet are misleading since the actual values
56+
to look for are in the "Absolute Maximum Ratings" table in the
57+
"Comparator Inputs" section. In there there's a line for each of the 5%,
58+
10% and 15% settings with the actual min, typical and max tolerances.
59+
$ref: /schemas/types.yaml#/definitions/string
60+
enum: [external, vdd_5_percent, vdd_10_percent, vdd_15_percent]
61+
default: external
62+
63+
adi,undervoltage-dividers:
64+
description: |
65+
Select which dividers to use for VDD Overvoltage detection. Note that
66+
when the internal dividers are used the threshold is referenced to VDD.
67+
The percentages in the datasheet are misleading since the actual values
68+
to look for are in the "Absolute Maximum Ratings" table in the
69+
"Comparator Inputs" section. In there there's a line for each of the 5%,
70+
10% and 15% settings with the actual min, typical and max tolerances.
71+
$ref: /schemas/types.yaml#/definitions/string
72+
enum: [external, vdd_5_percent, vdd_10_percent, vdd_15_percent]
73+
default: external
74+
75+
adi,current-limit-sense-microvolt:
76+
description:
77+
The current limit sense voltage of the chip is adjustable between
78+
12.5mV and 34.4mV in 3.1mV steps. This effectively limits the current
79+
on the load.
80+
enum: [12500, 15625, 18750, 21875, 25000, 28125, 31250, 34375]
81+
default: 25000
82+
83+
adi,overcurrent-retry:
84+
description:
85+
If set, enables the chip to auto-retry 256 timer cycles after an
86+
Overcurrent fault.
87+
type: boolean
88+
89+
adi,overvoltage-retry-disable:
90+
description:
91+
If set, disables the chip to auto-retry 50ms after an Overvoltage fault.
92+
It's enabled by default.
93+
type: boolean
94+
95+
adi,undervoltage-retry-disable:
96+
description:
97+
If set, disables the chip to auto-retry 50ms after an Undervoltage fault.
98+
It's enabled by default.
99+
type: boolean
100+
101+
adi,fault-log-enable:
102+
description:
103+
If set, enables the FAULT_LOG and ADC_ALERT_LOG registers to be written
104+
to the EEPROM when a fault bit transitions high and hence, will be
105+
available after a power cycle (the chip loads the contents of
106+
the EE_FAULT_LOG register - the one in EEPROM - into FAULT_LOG at boot).
107+
type: boolean
108+
109+
adi,gpio1-mode:
110+
description: Defines the function of the Pin. It can indicate that power is
111+
good (PULL the pin low when power is not good) or that power is bad (Go
112+
into high-z when power is not good).
113+
$ref: /schemas/types.yaml#/definitions/string
114+
enum: [power_bad, power_good]
115+
default: power_good
116+
117+
adi,gpio2-mode:
118+
description: Defines the function of the Pin. It can be set as the input for
119+
the ADC or indicating that the MOSFET is in stress (dissipating power).
120+
$ref: /schemas/types.yaml#/definitions/string
121+
enum: [adc_input, stress_fet]
122+
default: adc_input
123+
124+
adi,gpio3-monitor-enable:
125+
description: If set, gpio3 is set as input for the ADC instead of gpio2.
126+
type: boolean
127+
128+
allOf:
129+
- if:
130+
required:
131+
- adi,gpio3-monitor-enable
132+
then:
133+
properties:
134+
adi,gpio2-mode:
135+
const: stress_fet
136+
137+
required:
138+
- compatible
139+
- reg
140+
- adi,rsense-nano-ohms
141+
142+
additionalProperties: false
143+
144+
examples:
145+
- |
146+
i2c {
147+
#address-cells = <1>;
148+
#size-cells = <0>;
149+
150+
hwmon@50 {
151+
compatible = "adi,ltc4282";
152+
reg = <0x50>;
153+
adi,rsense-nano-ohms = <500>;
154+
155+
adi,gpio1-mode = "power_good";
156+
adi,gpio2-mode = "adc_input";
157+
};
158+
};
159+
...
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/amphenol,chipcap2.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: ChipCap 2 humidity and temperature iio sensor
8+
9+
maintainers:
10+
- Javier Carrasco <javier.carrasco.cruz@gmail.com>
11+
12+
description: |
13+
Relative humidity and temperature sensor on I2C bus.
14+
15+
Datasheets:
16+
https://www.amphenol-sensors.com/en/telaire/humidity/527-humidity-sensors/3095-chipcap-2
17+
18+
properties:
19+
compatible:
20+
oneOf:
21+
- const: amphenol,cc2d23
22+
- items:
23+
- enum:
24+
- amphenol,cc2d23s
25+
- amphenol,cc2d25
26+
- amphenol,cc2d25s
27+
- amphenol,cc2d33
28+
- amphenol,cc2d33s
29+
- amphenol,cc2d35
30+
- amphenol,cc2d35s
31+
- const: amphenol,cc2d23
32+
33+
reg:
34+
maxItems: 1
35+
36+
interrupts:
37+
items:
38+
- description: measurement ready indicator
39+
- description: low humidity alarm
40+
- description: high humidity alarm
41+
42+
interrupt-names:
43+
items:
44+
- const: ready
45+
- const: low
46+
- const: high
47+
48+
vdd-supply:
49+
description:
50+
Dedicated, controllable supply-regulator to reset the device and
51+
enter in command mode.
52+
53+
required:
54+
- compatible
55+
- reg
56+
- vdd-supply
57+
58+
additionalProperties: false
59+
60+
examples:
61+
- |
62+
#include <dt-bindings/interrupt-controller/irq.h>
63+
i2c {
64+
#address-cells = <1>;
65+
#size-cells = <0>;
66+
67+
humidity@28 {
68+
compatible = "amphenol,cc2d23s", "amphenol,cc2d23";
69+
reg = <0x28>;
70+
interrupt-parent = <&gpio>;
71+
interrupts = <4 IRQ_TYPE_EDGE_RISING>,
72+
<5 IRQ_TYPE_EDGE_RISING>,
73+
<6 IRQ_TYPE_EDGE_RISING>;
74+
interrupt-names = "ready", "low", "high";
75+
vdd-supply = <&reg_vdd>;
76+
};
77+
};

0 commit comments

Comments
 (0)