Skip to content

Commit a8cc7eb

Browse files
committed
Merge tag 'hwmon-for-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck: "New drivers: - Infineon XDP710 - EC Chip driver for Lenovo ThinkStation motherboards - Analog Devices ADP1050 Improved support for existing drivers: - emc1403: Convert to with_info API; Support for EMC1428 and EMC1438 - nzxt-kraken3: Support for NZXT Kraken 2023 - aquacomputer_d5next: Support for Octo flow sensors - pmbus/adm1275: Support for ADM1281 - dell-smm: Supportt for Precision 7540 and G5 5505 Other notable cleanup: - max6639: Use regmap - Remove unused structure fields from multiple drivers - Drop explicit initialization of struct i2c_device_id::driver_data to zero - Improve configuration mode handling in it87 driver - jc42: Drop support for I2C_CLASS_SPD - Various conversions to devicetree schema - Add HAS_IOPORT dependencies as needed Minor fixes and improvements to max31790, coretemp, aspeed-g6-pwm-tach, pwm-fan, pmbus/mp2975, acpi_power_meter, and lm70 drivers" * tag 'hwmon-for-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (52 commits) hwmon: (nzxt-kraken3) Bail out for unsupported device variants hwmon: (emc1403) Add support for EMC1428 and EMC1438. hwmon: Drop explicit initialization of struct i2c_device_id::driver_data to 0 (part 2) hwmon: (emc1403) Add support for conversion interval configuration hwmon: (emc1403) Support 11 bit accuracy hwmon: (emc1403) Convert to with_info API hwmon: (max6639) Use regmap hwmon: (npcm750-pwm-fan) Remove another unused field in struct npcm7xx_cooling_device hwmon: (npcm750-pwm-fan) Remove an unused field in struct npcm7xx_cooling_device hwmon: (stts751) Remove an unused field in struct stts751_priv hwmon: Drop explicit initialization of struct i2c_device_id::driver_data to 0 hwmon: (max31790) revise the scale to write pwm hwmon: (nzxt-kraken3) Add support for NZXT Kraken 2023 (standard and Elite) models hwmon: (nzxt-kraken3) Decouple device names from kinds hwmon: (it87) Remove tests nolonger required hwmon: (it87) Test for chipset before entering configuration mode hwmon: (it87) Do not enter configuration mode for some chiptypes hwmon: (it87) Rename FEAT_CONF_NOEXIT to FEAT_NOCONF as more descriptive of requirement hwmon: (pmbus) Add support for Infineon XDP710 dt-bindings: hwmon: Add infineon xdp710 driver bindings ...
2 parents e2b4a5b + 5fbf873 commit a8cc7eb

File tree

147 files changed

+2578
-964
lines changed

Some content is hidden

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

147 files changed

+2578
-964
lines changed

Documentation/devicetree/bindings/hwmon/adc128d818.txt

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

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
$id: http://devicetree.org/schemas/hwmon/adi,adm1275.yaml#
66
$schema: http://devicetree.org/meta-schemas/core.yaml#
77

8-
title: Analog Devices ADM1075/ADM127x/ADM129x digital power monitors
8+
title: Analog Devices ADM1075/ADM127x/ADM1281/ADM129x digital power monitors
99

1010
maintainers:
1111
- Krzysztof Kozlowski <[email protected]>
@@ -27,6 +27,7 @@ properties:
2727
- adi,adm1275
2828
- adi,adm1276
2929
- adi,adm1278
30+
- adi,adm1281
3031
- adi,adm1293
3132
- adi,adm1294
3233

@@ -91,6 +92,7 @@ allOf:
9192
contains:
9293
enum:
9394
- adi,adm1278
95+
- adi,adm1281
9496
- adi,adm1293
9597
- adi,adm1294
9698
then:

Documentation/devicetree/bindings/hwmon/as370.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/ibm,opal-sensor.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: IBM POWERNV platform sensors
8+
9+
maintainers:
10+
- Javier Carrasco <[email protected]>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- ibm,opal-sensor-cooling-fan
16+
- ibm,opal-sensor-amb-temp
17+
- ibm,opal-sensor-power-supply
18+
- ibm,opal-sensor-power
19+
20+
sensor-id:
21+
description:
22+
An opaque id provided by the firmware to the kernel, identifies a
23+
given sensor and its attribute data.
24+
$ref: /schemas/types.yaml#/definitions/uint32
25+
26+
required:
27+
- compatible
28+
- sensor-id
29+
30+
additionalProperties: false
31+
32+
examples:
33+
- |
34+
sensor {
35+
compatible = "ibm,opal-sensor-cooling-fan";
36+
sensor-id = <0x7052107>;
37+
};

Documentation/devicetree/bindings/hwmon/ibm,p8-occ-hwmon.txt

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

Documentation/devicetree/bindings/hwmon/ibmpowernv.txt

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

Documentation/devicetree/bindings/hwmon/lm87.txt

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

Documentation/devicetree/bindings/hwmon/max6650.txt

Lines changed: 0 additions & 28 deletions
This file was deleted.
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
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,max6650.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Maxim MAX6650 and MAX6651 I2C Fan Controllers
9+
10+
maintainers:
11+
- Javier Carrasco <[email protected]>
12+
13+
description: |
14+
The MAX6650 and MAX6651 regulate and monitor the speed
15+
of 5VDC/12VDC burshless fans with built-in tachometers.
16+
17+
Datasheets:
18+
https://datasheets.maximintegrated.com/en/ds/MAX6650-MAX6651.pdf
19+
20+
properties:
21+
compatible:
22+
enum:
23+
- maxim,max6650
24+
- maxim,max6651
25+
26+
reg:
27+
maxItems: 1
28+
29+
maxim,fan-microvolt:
30+
description:
31+
The supply voltage of the fan, either 5000000 uV or
32+
12000000 uV.
33+
enum: [5000000, 12000000]
34+
35+
maxim,fan-prescale:
36+
description:
37+
Pre-scaling value, as per datasheet. Lower values
38+
allow more fine-grained control of slower fans.
39+
$ref: /schemas/types.yaml#/definitions/uint32
40+
enum: [1, 2, 4, 8, 16]
41+
42+
maxim,fan-target-rpm:
43+
description:
44+
Initial requested fan rotation speed. If specified, the
45+
driver selects closed-loop mode and the requested speed.
46+
This ensures the fan is already running before userspace
47+
takes over.
48+
$ref: /schemas/types.yaml#/definitions/uint32
49+
maximum: 30000
50+
51+
required:
52+
- compatible
53+
- reg
54+
55+
additionalProperties: false
56+
57+
examples:
58+
- |
59+
i2c {
60+
#address-cells = <1>;
61+
#size-cells = <0>;
62+
63+
fan-controller@1b {
64+
compatible = "maxim,max6650";
65+
reg = <0x1b>;
66+
maxim,fan-microvolt = <12000000>;
67+
maxim,fan-prescale = <4>;
68+
maxim,fan-target-rpm = <1200>;
69+
};
70+
};
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+
$id: http://devicetree.org/schemas/hwmon/pmbus/adi,adp1050.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Analog Devices ADP1050 digital controller with PMBus interface
8+
9+
maintainers:
10+
- Radu Sabau <[email protected]>
11+
12+
description: |
13+
The ADP1050 is used to monitor system voltages, currents and temperatures.
14+
Through the PMBus interface, the ADP1050 targets isolated power supplies
15+
and has four individual monitors for input/output voltage, input current
16+
and temperature.
17+
Datasheet:
18+
https://www.analog.com/en/products/adp1050.html
19+
20+
properties:
21+
compatible:
22+
const: adi,adp1050
23+
24+
reg:
25+
maxItems: 1
26+
27+
vcc-supply: true
28+
29+
required:
30+
- compatible
31+
- reg
32+
- vcc-supply
33+
34+
additionalProperties: false
35+
36+
examples:
37+
- |
38+
i2c {
39+
#address-cells = <1>;
40+
#size-cells = <0>;
41+
clock-frequency = <100000>;
42+
43+
hwmon@70 {
44+
compatible = "adi,adp1050";
45+
reg = <0x70>;
46+
vcc-supply = <&vcc>;
47+
};
48+
};
49+
...

0 commit comments

Comments
 (0)