Skip to content

Commit d54f486

Browse files
committed
Merge tag 'hwmon-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck: "New driver: - Maxim MAX6620 Notable functional enhancements: - Add Asus WMI support to nct6775 driver, and list boards supporting it - Move TMP461 support from tm401 driver to lm90 driver - Add support for fanX_min, fanX_max and fanX_target to dell-smm driver, and clean it up while doing so - Extend mlxreg-fan driver to support multiple cooling devices and multiple PWM channels. Also increase number of supported fan tachometers. - Add a new customer ID (for ASRock) to nct6683 driver - Make temperature/voltage sensors on nct7802 configurable - Add mfg_id debugfs entry to pmbus/ibm-cffps driver - Support configurable sense resistor values in pmbus/lm25066, and fix various coefficients - Use generic notification mechanism in raspberrypi driver Notable cleanups: - Convert various devicetree bindings to dtschema, and add missing bindings - Convert i5500_temp and tmp103 drivers to devm_hwmon_device_register_with_info - Clean up non-bool "valid" data fields - Improve devicetree configurability for tmp421 driver" * tag 'hwmon-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (73 commits) hwmon: (nct7802) Add of_node_put() before return hwmon: (tmp401) Drop support for TMP461 hwmon: (lm90) Add basic support for TI TMP461 hwmon: (lm90) Introduce flag indicating extended temperature support hwmon: (nct6775) add ProArt X570-CREATOR WIFI. hwmon: (nct7802) Make temperature/voltage sensors configurable dt-bindings: hwmon: Add nct7802 bindings hwmon: (dell-smm) Speed up setting of fan speed hwmon: (dell-smm) Add comment explaining usage of i8k_config_data[] hwmon: (dell-smm) Return -ENOIOCTLCMD instead of -EINVAL hwmon: (dell-smm) Use strscpy_pad() hwmon: (dell-smm) Sort includes in alphabetical order hwmon: (tmp421) Add of_node_put() before return hwmon: (max31722) Warn about failure to put device in stand-by in .remove() hwmon: (acpi_power_meter) Use acpi_bus_get_acpi_device() hwmon: (dell-smm) Add support for fanX_min, fanX_max and fanX_target dt-bindings: hwmon: allow specifying channels for tmp421 hwmon: (tmp421) ignore non-channel related DT nodes hwmon: (tmp421) update documentation hwmon: (tmp421) support HWMON_T_ENABLE ...
2 parents 2019295 + 10f0d2a commit d54f486

Some content is hidden

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

123 files changed

+2895
-954
lines changed

Documentation/devicetree/bindings/hwmon/dps650ab.txt

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

Documentation/devicetree/bindings/hwmon/hih6130.txt

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

Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt

Lines changed: 0 additions & 26 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 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: "http://devicetree.org/schemas/hwmon/iio-hwmon.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: ADC-attached Hardware Sensor Device Tree Bindings
8+
9+
maintainers:
10+
- Jonathan Cameron <[email protected]>
11+
12+
description: >
13+
Bindings for hardware monitoring devices connected to ADC controllers
14+
supporting the Industrial I/O bindings.
15+
16+
properties:
17+
compatible:
18+
const: iio-hwmon
19+
20+
io-channels:
21+
minItems: 1
22+
maxItems: 8 # Should be enough
23+
description: >
24+
List of phandles to ADC channels to read the monitoring values
25+
26+
required:
27+
- compatible
28+
- io-channels
29+
30+
additionalProperties: false
31+
32+
examples:
33+
- |
34+
iio-hwmon {
35+
compatible = "iio-hwmon";
36+
io-channels = <&adc 1>, <&adc 2>;
37+
};

Documentation/devicetree/bindings/hwmon/jc42.txt

Lines changed: 0 additions & 46 deletions
This file was deleted.
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# SPDX-License-Identifier: GPL-2.0-only or BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/jedec,jc42.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Jedec JC-42.4 compatible temperature sensors
8+
9+
maintainers:
10+
- Jean Delvare <[email protected]>
11+
- Guenter Roeck <[email protected]>
12+
13+
select:
14+
properties:
15+
compatible:
16+
const: jedec,jc-42.4-temp
17+
18+
required:
19+
- compatible
20+
21+
properties:
22+
compatible:
23+
oneOf:
24+
- const: jedec,jc-42.4-temp
25+
- items:
26+
- enum:
27+
- adi,adt7408
28+
- atmel,at30ts00
29+
- atmel,at30tse004
30+
- idt,tse2002
31+
- idt,tse2004
32+
- idt,ts3000
33+
- idt,ts3001
34+
- maxim,max6604
35+
- microchip,mcp9804
36+
- microchip,mcp9805
37+
- microchip,mcp9808
38+
- microchip,mcp98243
39+
- microchip,mcp98244
40+
- microchip,mcp9843
41+
- nxp,se97
42+
- nxp,se97b
43+
- nxp,se98
44+
- onnn,cat6095
45+
- onnn,cat34ts02
46+
- st,stts2002
47+
- st,stts2004
48+
- st,stts3000
49+
- st,stts424
50+
- st,stts424e
51+
- const: jedec,jc-42.4-temp
52+
53+
reg:
54+
maxItems: 1
55+
56+
smbus-timeout-disable:
57+
description: |
58+
When set, the smbus timeout function will be disabled. This is not
59+
supported on all chips.
60+
type: boolean
61+
62+
required:
63+
- compatible
64+
- reg
65+
66+
additionalProperties: false
67+
68+
examples:
69+
- |
70+
i2c {
71+
#address-cells = <1>;
72+
#size-cells = <0>;
73+
74+
temp-sensor@1a {
75+
compatible = "jedec,jc-42.4-temp";
76+
reg = <0x1a>;
77+
};
78+
};
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# SPDX-License-Identifier: GPL-2.0-only or BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/lltc,ltc4151.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: LTC4151 High Voltage I2C Current and Voltage Monitor
8+
9+
maintainers:
10+
- Krzysztof Kozlowski <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: lltc,ltc4151
15+
16+
reg:
17+
maxItems: 1
18+
19+
shunt-resistor-micro-ohms:
20+
description:
21+
Shunt resistor value in micro-Ohms
22+
default: 1000
23+
24+
required:
25+
- compatible
26+
- reg
27+
28+
additionalProperties: false
29+
30+
examples:
31+
- |
32+
i2c {
33+
#address-cells = <1>;
34+
#size-cells = <0>;
35+
36+
sensor@6e {
37+
compatible = "lltc,ltc4151";
38+
reg = <0x6e>;
39+
shunt-resistor-micro-ohms = <1500>;
40+
};
41+
};

Documentation/devicetree/bindings/hwmon/lm70.txt

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

Documentation/devicetree/bindings/hwmon/lm90.txt

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

Documentation/devicetree/bindings/hwmon/ltc4151.txt

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

0 commit comments

Comments
 (0)