Skip to content

Commit c07666e

Browse files
torvaldstorvalds
committed
Merge tag 'hwmon-for-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck: "New drivers: - Driver for HTU31 - Congatec Board Controller monitoring driver - Driver for TI INA233 Current and Power Monitor Support for additional chips or boards in existing drivers: - pmbus/ltc2978: Add support for LT717x and LTM4673 - asus-ec-sensors: Add PRIME X670E-PRO WIFI - k10temp: Add support for cyan skillfish - nct6683: Add customer ID for AMD BC-250 - lm90: Add support for NCT7716, NCT7717 and NCT7718 Other notable improvements in existing drivers: - emc2305: Add devicetree support, and use devm_thermal_of_cooling_device_register - acpi_power_meter: Convert to with_info API - dell-smm: Increase the number of fans - pmbus/core: Optimize debugfs support and use i2c_client debugfs directory - hwmon core: Fix the missing of 'average' word in hwmon_power_attr_templates - Various drivers: Use per-client debugfs entry provided by I2C subsystem" * tag 'hwmon-for-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (49 commits) hwmon: emc2305: Use devm_thermal_of_cooling_device_register hwmon: emc2305: Add OF support dt-bindings: hwmon: Add Microchip emc2305 support dt-bindings: hwmon: Drop stray blank line in the header hwmon: (acpi_power_meter) Replace the deprecated hwmon_device_register hwmon: add driver for HTU31 dt-bindings: hwmon: Add description for sensor HTU31 hwmon: Add driver for TI INA233 Current and Power Monitor dt-bindings: hwmon: ti,ina2xx: Add INA233 device hwmon: Add Congatec Board Controller monitoring driver hwmon: (pmbus/ltc2978) add support for lt717x dt-bindings: hwmon: ltc2978: add support for LT717x hwmon: (pmbus/ltc2978) Add support for LT717x - docs hwmon: (dell-smm) Increment the number of fans hwmon: (ntc_thermistor) return error instead of clipping on OOB hwmon: (pt5161l) Use per-client debugfs entry hwmon: Fix the missing of 'average' word in hwmon_power_attr_templates hwmon: (acpi_power_meter) Fix the fake power alarm reporting hwmon: (gpio-fan) Add missing mutex locks dt-bindings: hwmon: gpio-fan: Add optional regulator support ...
2 parents 5e0c2cc + 2115cbe commit c07666e

Some content is hidden

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

64 files changed

+2144
-985
lines changed

‎Documentation/devicetree/bindings/hwmon/adi,ad741x.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
54
$id: http://devicetree.org/schemas/hwmon/adi,ad741x.yaml#
65
$schema: http://devicetree.org/meta-schemas/core.yaml#
76

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
54
$id: http://devicetree.org/schemas/hwmon/adi,adm1275.yaml#
65
$schema: http://devicetree.org/meta-schemas/core.yaml#
76

‎Documentation/devicetree/bindings/hwmon/adi,ltc2991.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
54
$id: http://devicetree.org/schemas/hwmon/adi,ltc2991.yaml#
65
$schema: http://devicetree.org/meta-schemas/core.yaml#
76

‎Documentation/devicetree/bindings/hwmon/gpio-fan.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ properties:
2323
alarm-gpios:
2424
maxItems: 1
2525

26+
fan-supply:
27+
description: Power supply for fan
28+
2629
gpio-fan,speed-map:
2730
$ref: /schemas/types.yaml#/definitions/uint32-matrix
2831
minItems: 2

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ maintainers:
1212
properties:
1313
compatible:
1414
enum:
15+
- lltc,lt7170
16+
- lltc,lt7171
1517
- lltc,ltc2972
1618
- lltc,ltc2974
1719
- lltc,ltc2975
@@ -30,6 +32,7 @@ properties:
3032
- lltc,ltc7880
3133
- lltc,ltm2987
3234
- lltc,ltm4664
35+
- lltc,ltm4673
3336
- lltc,ltm4675
3437
- lltc,ltm4676
3538
- lltc,ltm4677
@@ -46,6 +49,7 @@ properties:
4649
description: |
4750
list of regulators provided by this controller.
4851
Valid names of regulators depend on number of supplies supported per device:
52+
* lt7170, lt7171 : vout0
4953
* ltc2972 vout0 - vout1
5054
* ltc2974, ltc2975 : vout0 - vout3
5155
* ltc2977, ltc2979, ltc2980, ltm2987 : vout0 - vout7
@@ -55,6 +59,7 @@ properties:
5559
* ltc7880 : vout0 - vout1
5660
* ltc3883 : vout0
5761
* ltm4664 : vout0 - vout1
62+
* ltm4673 : vout0 - vout3
5863
* ltm4675, ltm4676, ltm4677, ltm4678 : vout0 - vout1
5964
* ltm4680, ltm4686 : vout0 - vout1
6065
* ltm4700 : vout0 - vout1

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
54
$id: http://devicetree.org/schemas/hwmon/maxim,max20730.yaml#
65
$schema: http://devicetree.org/meta-schemas/core.yaml#
76

‎Documentation/devicetree/bindings/hwmon/maxim,max6639.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
54
$id: http://devicetree.org/schemas/hwmon/maxim,max6639.yaml#
65
$schema: http://devicetree.org/meta-schemas/core.yaml#
76

‎Documentation/devicetree/bindings/hwmon/maxim,max6650.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
54
$id: http://devicetree.org/schemas/hwmon/maxim,max6650.yaml#
65
$schema: http://devicetree.org/meta-schemas/core.yaml#
76

‎Documentation/devicetree/bindings/hwmon/microchip,emc2305.yaml

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/microchip,emc2305.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip EMC2305 SMBus compliant PWM fan controller
8+
9+
maintainers:
10+
- Michael Shych <michaelsh@nvidia.com>
11+
12+
description:
13+
Microchip EMC2301/2/3/5 pwm controller which supports up to five programmable
14+
fan control circuits.
15+
16+
properties:
17+
compatible:
18+
oneOf:
19+
- enum:
20+
- microchip,emc2305
21+
- items:
22+
- enum:
23+
- microchip,emc2303
24+
- microchip,emc2302
25+
- microchip,emc2301
26+
- const: microchip,emc2305
27+
28+
reg:
29+
maxItems: 1
30+
31+
'#address-cells':
32+
const: 1
33+
34+
'#size-cells':
35+
const: 0
36+
37+
'#pwm-cells':
38+
const: 3
39+
description: |
40+
Number of cells in a PWM specifier.
41+
- cell 0: The PWM frequency
42+
- cell 1: The PWM polarity: 0 or PWM_POLARITY_INVERTED
43+
- cell 2: The PWM output config:
44+
- 0 (Open-Drain)
45+
- 1 (Push-Pull)
46+
47+
patternProperties:
48+
'^fan@[0-4]$':
49+
$ref: fan-common.yaml#
50+
unevaluatedProperties: false
51+
properties:
52+
reg:
53+
description:
54+
The fan number used to determine the associated PWM channel.
55+
maxItems: 1
56+
57+
required:
58+
- reg
59+
60+
required:
61+
- compatible
62+
- reg
63+
64+
additionalProperties: false
65+
66+
examples:
67+
- |
68+
#include <dt-bindings/pwm/pwm.h>
69+
i2c {
70+
#address-cells = <1>;
71+
#size-cells = <0>;
72+
73+
fan_controller: fan-controller@2f {
74+
compatible = "microchip,emc2305";
75+
reg = <0x2f>;
76+
#address-cells = <1>;
77+
#size-cells = <0>;
78+
#pwm-cells = <3>;
79+
80+
fan@0 {
81+
reg = <0x0>;
82+
pwms = <&fan_controller 26000 PWM_POLARITY_INVERTED 1>;
83+
#cooling-cells = <2>;
84+
};
85+
86+
fan@1 {
87+
reg = <0x1>;
88+
pwms = <&fan_controller 26000 0 1>;
89+
#cooling-cells = <2>;
90+
};
91+
92+
fan@2 {
93+
reg = <0x2>;
94+
pwms = <&fan_controller 26000 0 1>;
95+
#cooling-cells = <2>;
96+
};
97+
98+
fan@3 {
99+
reg = <0x3>;
100+
pwms = <&fan_controller 26000 0 1>;
101+
#cooling-cells = <2>;
102+
};
103+
104+
fan@4 {
105+
reg = <0x4>;
106+
pwms = <&fan_controller 26000 0 1>;
107+
#cooling-cells = <2>;
108+
};
109+
};
110+
};
111+
...

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ properties:
3232
- national,lm89
3333
- national,lm90
3434
- national,lm99
35+
- nuvoton,nct7716
36+
- nuvoton,nct7717
37+
- nuvoton,nct7718
3538
- nxp,sa56004
3639
- onnn,nct1008
3740
- ti,tmp451
@@ -120,6 +123,8 @@ allOf:
120123
- dallas,max6659
121124
- dallas,max6695
122125
- dallas,max6696
126+
- nuvoton,nct7716
127+
- nuvoton,nct7717
123128
then:
124129
patternProperties:
125130
"^channel@([0-2])$":
@@ -155,6 +160,7 @@ allOf:
155160
- national,lm89
156161
- national,lm90
157162
- national,lm99
163+
- nuvoton,nct7718
158164
- nxp,sa56004
159165
- winbond,w83l771
160166
then:

0 commit comments

Comments
 (0)