Skip to content

Commit 47acac8

Browse files
torvaldstorvalds
committed
Merge tag 'hwmon-for-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck: - New driver for AXI fan control - Attenuator bypass support and support for inverting pwm output in adt7475 driver - Support for new power supply version in ibm-cffps driver - PMBus drivers: * support for multi-phase chips * ltc2978 driver: add support for LTC2972, LTC2979, LTC3884, LTC3889, LTC7880, LTM4664, LTM4677, LTM4678, LTM4680, and LTM4700/ * tps53679 driver: add support for TPS53681, TPS53647, and TPS53667 * isl68137 driver: support for various 2nd Gen Renesas digital multiphase chips added to isl68137 driver - Minor improvements and fixes in nct7904, ibmpowernv, lm73, ibmaem, and k10temp drivers * tag 'hwmon-for-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (29 commits) docs: hwmon: Update documentation for isl68137 pmbus driver hwmon: (pmbus) add support for 2nd Gen Renesas digital multiphase hwmon: (pmbus/ibm-cffps) Add another PSU CCIN to version detection hwmon: (nct7904) Fix the incorrect quantity for fan & temp attributes hwmon: (ibmpowernv) Use scnprintf() for avoiding potential buffer overflow hwmon: (adt7475) Add support for inverting pwm output hwmon: (adt7475) Add attenuator bypass support dt-bindings: hwmon: Document adt7475 pwm-active-state property dt-bindings: hwmon: Document adt7475 bypass-attenuator property dt-bindings: hwmon: Document adt7475 binding hwmon: (lm73) Add support for of_match_table dt-bindings: Add TI LM73 as a trivial device hwmon: (pmbus/tps53679) Add documentation hwmon: (pmbus/tps53679) Add support for TPS53647 and TPS53667 hwmon: (pmbus/tps53679) Add support for TPS53681 hwmon: (pmbus/tps53679) Add support for IIN and PIN to TPS53679 and TPS53688 hwmon: (pmbus/tps53679) Add support for multiple chips IDs hwmon: (pmbus) Implement multi-phase support hwmon: (pmbus) Add 'phase' parameter where needed for multi-phase support hwmon: (pmbus) Add IC_DEVICE_ID and IC_DEVICE_REV command definitions ...
2 parents ff7b862 + 5b10a81 commit 47acac8

Some content is hidden

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

41 files changed

+2325
-311
lines changed

‎Documentation/devicetree/bindings/hwmon/adi,axi-fan-control.yaml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
# Copyright 2019 Analog Devices Inc.
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/bindings/hwmon/adi,axi-fan-control.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Analog Devices AXI FAN Control Device Tree Bindings
9+
10+
maintainers:
11+
- Nuno Sá <[email protected]>
12+
13+
description: |+
14+
Bindings for the Analog Devices AXI FAN Control driver. Spefications of the
15+
core can be found in:
16+
17+
https://wiki.analog.com/resources/fpga/docs/axi_fan_control
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- adi,axi-fan-control-1.00.a
23+
24+
reg:
25+
maxItems: 1
26+
27+
clocks:
28+
maxItems: 1
29+
30+
interrupts:
31+
maxItems: 1
32+
33+
pulses-per-revolution:
34+
description:
35+
Value specifying the number of pulses per revolution of the controlled
36+
FAN.
37+
allOf:
38+
- $ref: /schemas/types.yaml#/definitions/uint32
39+
enum: [1, 2, 4]
40+
41+
required:
42+
- compatible
43+
- reg
44+
- clocks
45+
- interrupts
46+
- pulses-per-revolution
47+
48+
examples:
49+
- |
50+
fpga_axi: fpga-axi@0 {
51+
#address-cells = <0x2>;
52+
#size-cells = <0x1>;
53+
54+
axi_fan_control: axi-fan-control@80000000 {
55+
compatible = "adi,axi-fan-control-1.00.a";
56+
reg = <0x0 0x80000000 0x10000>;
57+
clocks = <&clk 71>;
58+
interrupts = <0 110 0>;
59+
pulses-per-revolution = <2>;
60+
};
61+
};
62+
...

‎Documentation/devicetree/bindings/hwmon/adt7475.yaml

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/adt7475.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: ADT7475 hwmon sensor
8+
9+
maintainers:
10+
- Jean Delvare <[email protected]>
11+
12+
description: |
13+
The ADT7473, ADT7475, ADT7476, and ADT7490 are thermal monitors and multiple
14+
PWN fan controllers.
15+
16+
They support monitoring and controlling up to four fans (the ADT7490 can only
17+
control up to three). They support reading a single on chip temperature
18+
sensor and two off chip temperature sensors (the ADT7490 additionally
19+
supports measuring up to three current external temperature sensors with
20+
series resistance cancellation (SRC)).
21+
22+
Datasheets:
23+
https://www.onsemi.com/pub/Collateral/ADT7473-D.PDF
24+
https://www.onsemi.com/pub/Collateral/ADT7475-D.PDF
25+
https://www.onsemi.com/pub/Collateral/ADT7476-D.PDF
26+
https://www.onsemi.com/pub/Collateral/ADT7490-D.PDF
27+
28+
Description taken from onsemiconductors specification sheets, with minor
29+
rephrasing.
30+
31+
properties:
32+
compatible:
33+
enum:
34+
- adi,adt7473
35+
- adi,adt7475
36+
- adi,adt7476
37+
- adi,adt7490
38+
39+
reg:
40+
maxItems: 1
41+
42+
patternProperties:
43+
"^adi,bypass-attenuator-in[0-4]$":
44+
description: |
45+
Configures bypassing the individual voltage input attenuator. If
46+
set to 1 the attenuator is bypassed if set to 0 the attenuator is
47+
not bypassed. If the property is absent then the attenuator
48+
retains it's configuration from the bios/bootloader.
49+
allOf:
50+
- $ref: /schemas/types.yaml#/definitions/uint32
51+
- enum: [0, 1]
52+
53+
"^adi,pwm-active-state$":
54+
description: |
55+
Integer array, represents the active state of the pwm outputs If set to 0
56+
the pwm uses a logic low output for 100% duty cycle. If set to 1 the pwm
57+
uses a logic high output for 100% duty cycle.
58+
allOf:
59+
- $ref: /schemas/types.yaml#/definitions/uint32-array
60+
- minItems: 3
61+
maxItems: 3
62+
items:
63+
enum: [0, 1]
64+
default: 1
65+
66+
required:
67+
- compatible
68+
- reg
69+
70+
examples:
71+
- |
72+
i2c {
73+
#address-cells = <1>;
74+
#size-cells = <0>;
75+
76+
hwmon@2e {
77+
compatible = "adi,adt7476";
78+
reg = <0x2e>;
79+
adi,bypass-attenuator-in0 = <1>;
80+
adi,bypass-attenuator-in1 = <0>;
81+
adi,pwm-active-state = <1 0 1>;
82+
};
83+
};
84+

‎Documentation/devicetree/bindings/hwmon/ltc2978.txt

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,30 @@ ltc2978
22

33
Required properties:
44
- compatible: should contain one of:
5+
* "lltc,ltc2972"
56
* "lltc,ltc2974"
67
* "lltc,ltc2975"
78
* "lltc,ltc2977"
89
* "lltc,ltc2978"
10+
* "lltc,ltc2979"
911
* "lltc,ltc2980"
1012
* "lltc,ltc3880"
1113
* "lltc,ltc3882"
1214
* "lltc,ltc3883"
15+
* "lltc,ltc3884"
1316
* "lltc,ltc3886"
1417
* "lltc,ltc3887"
18+
* "lltc,ltc3889"
19+
* "lltc,ltc7880"
1520
* "lltc,ltm2987"
21+
* "lltc,ltm4664"
1622
* "lltc,ltm4675"
1723
* "lltc,ltm4676"
24+
* "lltc,ltm4677"
25+
* "lltc,ltm4678"
26+
* "lltc,ltm4680"
1827
* "lltc,ltm4686"
28+
* "lltc,ltm4700"
1929
- reg: I2C slave address
2030

2131
Optional properties:
@@ -25,13 +35,17 @@ Optional properties:
2535
standard binding for regulators; see regulator.txt.
2636

2737
Valid names of regulators depend on number of supplies supported per device:
38+
* ltc2972 vout0 - vout1
2839
* ltc2974, ltc2975 : vout0 - vout3
29-
* ltc2977, ltc2980, ltm2987 : vout0 - vout7
40+
* ltc2977, ltc2979, ltc2980, ltm2987 : vout0 - vout7
3041
* ltc2978 : vout0 - vout7
31-
* ltc3880, ltc3882, ltc3886 : vout0 - vout1
42+
* ltc3880, ltc3882, ltc3884, ltc3886, ltc3887, ltc3889 : vout0 - vout1
43+
* ltc7880 : vout0 - vout1
3244
* ltc3883 : vout0
33-
* ltm4676 : vout0 - vout1
34-
* ltm4686 : vout0 - vout1
45+
* ltm4664 : vout0 - vout1
46+
* ltm4675, ltm4676, ltm4677, ltm4678 : vout0 - vout1
47+
* ltm4680, ltm4686 : vout0 - vout1
48+
* ltm4700 : vout0 - vout1
3549

3650
Example:
3751
ltc2978@5e {

‎Documentation/devicetree/bindings/trivial-devices.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,6 @@ properties:
3434
- adi,adt7461
3535
# +/-1C TDM Extended Temp Range I.C
3636
- adt7461
37-
# +/-1C TDM Extended Temp Range I.C
38-
- adi,adt7473
39-
# +/-1C TDM Extended Temp Range I.C
40-
- adi,adt7475
41-
# +/-1C TDM Extended Temp Range I.C
42-
- adi,adt7476
43-
# +/-1C TDM Extended Temp Range I.C
44-
- adi,adt7490
4537
# Three-Axis Digital Accelerometer
4638
- adi,adxl345
4739
# Three-Axis Digital Accelerometer (backward-compatibility value "adi,adxl345" must be listed too)
@@ -350,6 +342,8 @@ properties:
350342
- ti,ads7830
351343
# Temperature Monitoring and Fan Control
352344
- ti,amc6821
345+
# Temperature sensor with 2-wire interface
346+
- ti,lm73
353347
# Temperature sensor with integrated fan control
354348
- ti,lm96000
355349
# I2C Touch-Screen Controller

‎Documentation/hwmon/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ Hardware Monitoring Kernel Drivers
162162
tmp421
163163
tmp513
164164
tps40422
165+
tps53679
165166
twl4030-madc-hwmon
166167
ucd9000
167168
ucd9200

0 commit comments

Comments
 (0)