Skip to content

Commit 0f97458

Browse files
torvaldstorvalds
committed
Merge tag 'hwmon-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck: "New drivers: - SB-TSI sensors - Lineat Technology LTC2992 - Delta power supplies Q54SJ108A2 - Maxim MAX127 - Corsair PSU - STMicroelectronics PM6764 Voltage Regulator New chip support: - P10 added to fsi/occ driver - NCT6687D added to nct6883 driver - Intel-based Xserves added to applesmc driver - AMD family 19h model 01h added to amd_energy driver And various minor bug fixes and improvements" * tag 'hwmon-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (41 commits) dt-bindings: (hwmon/sbtsi_temp) Add SB-TSI hwmon driver bindings hwmon: (sbtsi) Add documentation hwmon: (sbtsi) Add basic support for SB-TSI sensors hwmon: (iio_hwmon) Drop bogus __refdata annotation hwmon: (xgene) Drop bogus __refdata annotation dt-bindings: hwmon: convert AD ADM1275 bindings to dt-schema hwmon: (occ) Add new temperature sensor type fsi: occ: Add support for P10 dt-bindings: fsi: Add P10 OCC device documentation dt-bindings: hwmon: convert TI ADS7828 bindings to dt-schema dt-bindings: hwmon: convert AD AD741x bindings to dt-schema dt-bindings: hwmon: convert TI INA2xx bindings to dt-schema hwmon: (ltc2992) Fix less than zero comparisons with an unsigned integer hwmon: (pmbus/q54sj108a2) Correct title underline length dt-bindings: hwmon: Add documentation for ltc2992 hwmon: (ltc2992) Add support for GPIOs. hwmon: (ltc2992) Add support hwmon: (pmbus) Driver for Delta power supplies Q54SJ108A2 hwmon: Add driver for STMicroelectronics PM6764 Voltage Regulator hwmon: (nct6683) Support NCT6687D. ...
2 parents ce51c2b + 1a03376 commit 0f97458

81 files changed

Lines changed: 3875 additions & 316 deletions

Some content is hidden

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

‎Documentation/devicetree/bindings/fsi/ibm,p9-occ.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
Device-tree bindings for FSI-attached POWER9 On-Chip Controller (OCC)
2-
---------------------------------------------------------------------
1+
Device-tree bindings for FSI-attached POWER9/POWER10 On-Chip Controller (OCC)
2+
-----------------------------------------------------------------------------
33

4-
This is the binding for the P9 On-Chip Controller accessed over FSI from a
5-
service processor. See fsi.txt for details on bindings for FSI slave and CFAM
4+
This is the binding for the P9 or P10 On-Chip Controller accessed over FSI from
5+
a service processor. See fsi.txt for details on bindings for FSI slave and CFAM
66
nodes. The OCC is not an FSI slave device itself, rather it is accessed
7-
through the SBE fifo.
7+
through the SBE FIFO.
88

99
Required properties:
10-
- compatible = "ibm,p9-occ"
10+
- compatible = "ibm,p9-occ" or "ibm,p10-occ"
1111

1212
Examples:
1313

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

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

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
5+
$id: http://devicetree.org/schemas/hwmon/adi,ad741x.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Analog Devices AD7416/AD7417/AD7418 temperature sensors
9+
10+
maintainers:
11+
- Krzysztof Kozlowski <krzk@kernel.org>
12+
13+
properties:
14+
compatible:
15+
enum:
16+
- adi,ad7416
17+
- adi,ad7417
18+
- adi,ad7418
19+
20+
reg:
21+
maxItems: 1
22+
23+
required:
24+
- compatible
25+
- reg
26+
27+
additionalProperties: false
28+
29+
examples:
30+
- |
31+
i2c {
32+
#address-cells = <1>;
33+
#size-cells = <0>;
34+
35+
temperature-sensor@28 {
36+
compatible = "adi,ad7418";
37+
reg = <0x28>;
38+
};
39+
};

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

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
5+
$id: http://devicetree.org/schemas/hwmon/adi,adm1275.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Analog Devices ADM1075/ADM127x/ADM129x digital power monitors
9+
10+
maintainers:
11+
- Krzysztof Kozlowski <krzk@kernel.org>
12+
13+
description: |
14+
The ADM1293 and ADM1294 are high accuracy integrated digital power monitors
15+
that offer digital current, voltage, and power monitoring using an on-chip,
16+
12-bit analog-to-digital converter (ADC), communicated through a PMBus
17+
compliant I2C interface.
18+
19+
Datasheets:
20+
https://www.analog.com/en/products/adm1294.html
21+
22+
properties:
23+
compatible:
24+
enum:
25+
- adi,adm1075
26+
- adi,adm1272
27+
- adi,adm1275
28+
- adi,adm1276
29+
- adi,adm1278
30+
- adi,adm1293
31+
- adi,adm1294
32+
33+
reg:
34+
maxItems: 1
35+
36+
shunt-resistor-micro-ohms:
37+
description:
38+
Shunt resistor value in micro-Ohm.
39+
40+
required:
41+
- compatible
42+
- reg
43+
44+
additionalProperties: false
45+
46+
examples:
47+
- |
48+
i2c {
49+
#address-cells = <1>;
50+
#size-cells = <0>;
51+
52+
power-sensor@10 {
53+
compatible = "adi,adm1272";
54+
reg = <0x10>;
55+
shunt-resistor-micro-ohms = <500>;
56+
};
57+
};

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

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
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,ltc2992.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Linear Technology 2992 Power Monitor
8+
9+
maintainers:
10+
- Alexandru Tachici <alexandru.tachici@analog.com>
11+
12+
description: |
13+
Linear Technology 2992 Dual Wide Range Power Monitor
14+
https://www.analog.com/media/en/technical-documentation/data-sheets/ltc2992.pdf
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- adi,ltc2992
20+
21+
reg:
22+
maxItems: 1
23+
24+
'#address-cells':
25+
const: 1
26+
27+
'#size-cells':
28+
const: 0
29+
30+
avcc-supply: true
31+
32+
patternProperties:
33+
"^channel@([0-1])$":
34+
type: object
35+
description: |
36+
Represents the two supplies to be monitored.
37+
38+
properties:
39+
reg:
40+
description: |
41+
The channel number. LTC2992 can monitor two supplies.
42+
items:
43+
minimum: 0
44+
maximum: 1
45+
46+
shunt-resistor-micro-ohms:
47+
description:
48+
The value of curent sense resistor in microohms.
49+
50+
required:
51+
- compatible
52+
- reg
53+
54+
additionalProperties: false
55+
56+
examples:
57+
- |
58+
i2c1 {
59+
#address-cells = <1>;
60+
#size-cells = <0>;
61+
62+
ltc2992@6F {
63+
#address-cells = <1>;
64+
#size-cells = <0>;
65+
66+
compatible = "adi,ltc2992";
67+
reg = <0x6F>;
68+
69+
channel@0 {
70+
reg = <0x0>;
71+
shunt-resistor-micro-ohms = <10000>;
72+
};
73+
74+
channel@1 {
75+
reg = <0x1>;
76+
shunt-resistor-micro-ohms = <10000>;
77+
};
78+
};
79+
};
80+
...

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

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

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

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

‎Documentation/devicetree/bindings/hwmon/amd,sbtsi.yaml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/amd,sbtsi.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: >
8+
Sideband interface Temperature Sensor Interface (SB-TSI) compliant
9+
AMD SoC temperature device
10+
11+
maintainers:
12+
- Kun Yi <kunyi@google.com>
13+
- Supreeth Venkatesh <supreeth.venkatesh@amd.com>
14+
15+
description: |
16+
SB Temperature Sensor Interface (SB-TSI) is an SMBus compatible
17+
interface that reports AMD SoC's Ttcl (normalized temperature),
18+
and resembles a typical 8-pin remote temperature sensor's I2C interface
19+
to BMC. The emulated thermal sensor can report temperatures in increments
20+
of 0.125 degrees, ranging from 0 to 255.875.
21+
22+
properties:
23+
compatible:
24+
enum:
25+
- amd,sbtsi
26+
27+
reg:
28+
maxItems: 1
29+
description: |
30+
I2C bus address of the device as specified in Section 6.3.1 of the
31+
SoC register reference. The SB-TSI address is normally 98h for socket
32+
0 and 90h for socket 1, but it could vary based on hardware address
33+
select pins.
34+
\[open source SoC register reference\]
35+
https://www.amd.com/system/files/TechDocs/56255_OSRR.pdf
36+
37+
required:
38+
- compatible
39+
- reg
40+
41+
additionalProperties: false
42+
43+
examples:
44+
- |
45+
i2c0 {
46+
#address-cells = <1>;
47+
#size-cells = <0>;
48+
49+
sbtsi@4c {
50+
compatible = "amd,sbtsi";
51+
reg = <0x4c>;
52+
};
53+
};
54+
...

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

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

‎Documentation/devicetree/bindings/hwmon/pwm-fan.txt‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@ Required properties:
88

99
Optional properties:
1010
- fan-supply : phandle to the regulator that provides power to the fan
11-
- interrupts : This contains a single interrupt specifier which
12-
describes the tachometer output of the fan as an
13-
interrupt source. The output signal must generate a
14-
defined number of interrupts per fan revolution, which
15-
require that it must be self resetting edge interrupts.
16-
See interrupt-controller/interrupts.txt for the format.
17-
- pulses-per-revolution : define the tachometer pulses per fan revolution as
18-
an integer (default is 2 interrupts per revolution).
19-
The value must be greater than zero.
11+
- interrupts : This contains an interrupt specifier for each fan
12+
tachometer output connected to an interrupt source.
13+
The output signal must generate a defined number of
14+
interrupts per fan revolution, which require that
15+
it must be self resetting edge interrupts. See
16+
interrupt-controller/interrupts.txt for the format.
17+
- pulses-per-revolution : define the number of pulses per fan revolution for
18+
each tachometer input as an integer (default is 2
19+
interrupts per revolution). The value must be
20+
greater than zero.
2021

2122
Example:
2223
fan0: pwm-fan {
@@ -55,3 +56,12 @@ Example 2:
5556
interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
5657
pulses-per-revolution = <2>;
5758
};
59+
60+
Example 3:
61+
fan0: pwm-fan {
62+
compatible = "pwm-fan";
63+
pwms = <&pwm1 0 25000 0>;
64+
interrupts-extended = <&gpio1 1 IRQ_TYPE_EDGE_FALLING>,
65+
<&gpio2 5 IRQ_TYPE_EDGE_FALLING>;
66+
pulses-per-revolution = <2>, <1>;
67+
};

0 commit comments

Comments
 (0)