Skip to content

Commit c443971

Browse files
torvaldstorvalds
committed
Merge tag 'hwmon-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck: "New driver and chip support: - Moortec MR75203 PVT controller - MPS Multi-phase mp2975 controller - ADM1266 - Zen3 CPUs - Intel MAX 10 BMC Enhancements: - Support for rated attributes in hwmon core - MAX20730: - Device monitoring via debugfs - VOUT readin adjustment vie devicetree bindings - LM75: - Devicetree support - Regulator support - Improved accumulationm logic in amd_energy driver - Added fan sensor to gsc-hwmon driver - Support for simplified I2C probing Various other minor fixes and improvements" * tag 'hwmon-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (64 commits) hwmon: (pmbus/max20730) adjust the vout reading given voltage divider dt-bindings: hwmon: max20730: adding device tree doc for max20730 hwmon: Add hardware monitoring driver for Moortec MR75203 PVT controller hwmon: Add DT bindings schema for PVT controller dt-bindings: hwmon: Add the +vs supply to the lm75 bindings dt-bindings: hwmon: Convert lm75 bindings to yaml docs: hwmon: (ltc2945) update datasheet link hwmon: (mlxreg-fan) Fix double "Mellanox" hwmon: (pmbus/max20730) add device monitoring via debugfs hwmon: (pmbus/max34440) Fix OC fault limits hwmon: (bt1-pvt) Wait for the completion with timeout hwmon: (bt1-pvt) Cache current update timeout hwmon: (bt1-pvt) Test sensor power supply on probe hwmon: (lm75) Add regulator support hwmon: Add hwmon driver for Intel MAX 10 BMC dt-bindings: Add MP2975 voltage regulator device hwmon: (pmbus) Add support for MPS Multi-phase mp2975 controller hwmon: (tmp513) fix spelling typo in comments hwmon: (amd_energy) Update driver documentation hwmon: (amd_energy) Improve the accumulation logic ...
2 parents 0486bea + 9b20aec commit c443971

167 files changed

Lines changed: 4576 additions & 1022 deletions

File tree

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/hwmon/adi,adm1266.yaml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
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,adm1266.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Analog Devices ADM1266 Cascadable Super Sequencer with Margin
8+
Control and Fault Recording
9+
10+
maintainers:
11+
- Alexandru Tachici <alexandru.tachici@analog.com>
12+
13+
description: |
14+
Analog Devices ADM1266 Cascadable Super Sequencer with Margin
15+
Control and Fault Recording.
16+
https://www.analog.com/media/en/technical-documentation/data-sheets/ADM1266.pdf
17+
18+
properties:
19+
compatible:
20+
enum:
21+
- adi,adm1266
22+
23+
reg:
24+
description: |
25+
I2C address of slave device.
26+
items:
27+
minimum: 0x40
28+
maximum: 0x4F
29+
30+
avcc-supply:
31+
description: |
32+
Phandle to the Avcc power supply.
33+
34+
required:
35+
- compatible
36+
- reg
37+
38+
additionalProperties: false
39+
40+
examples:
41+
- |
42+
i2c0 {
43+
#address-cells = <1>;
44+
#size-cells = <0>;
45+
46+
adm1266@40 {
47+
compatible = "adi,adm1266";
48+
reg = <0x40>;
49+
};
50+
};
51+
...

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

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

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

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# SPDX-License-Identifier: GPL-2.0-only or BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/lm75.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: LM75 hwmon sensor
8+
9+
maintainers:
10+
- Jean Delvare <jdelvare@suse.com>
11+
- Guenter Roeck <linux@roeck-us.net>
12+
13+
properties:
14+
compatible:
15+
enum:
16+
- adi,adt75
17+
- dallas,ds1775
18+
- dallas,ds75
19+
- dallas,ds7505
20+
- gmt,g751
21+
- national,lm75
22+
- national,lm75a
23+
- national,lm75b
24+
- maxim,max6625
25+
- maxim,max6626
26+
- maxim,max31725
27+
- maxim,max31726
28+
- maxim,mcp980x
29+
- nxp,pct2075
30+
- st,stds75
31+
- st,stlm75
32+
- microchip,tcn75
33+
- ti,tmp100
34+
- ti,tmp101
35+
- ti,tmp105
36+
- ti,tmp112
37+
- ti,tmp175
38+
- ti,tmp275
39+
- ti,tmp75
40+
- ti,tmp75b
41+
- ti,tmp75c
42+
43+
reg:
44+
maxItems: 1
45+
46+
vs-supply:
47+
description: phandle to the regulator that provides the +VS supply
48+
49+
required:
50+
- compatible
51+
- reg
52+
53+
additionalProperties: false
54+
55+
examples:
56+
- |
57+
i2c {
58+
#address-cells = <1>;
59+
#size-cells = <0>;
60+
61+
sensor@48 {
62+
compatible = "st,stlm75";
63+
reg = <0x48>;
64+
vs-supply = <&vs>;
65+
};
66+
};

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

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
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,max20730.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Maxim max20730
9+
10+
maintainers:
11+
- Jean Delvare <jdelvare@suse.com>
12+
- Guenter Roeck <linux@roeck-us.net>
13+
14+
description: |
15+
The MAX20730 is a fully integrated, highly efficient switching regulator
16+
with PMBus for applications operating from 4.5V to 16V and requiring
17+
up to 25A (max) load. This single-chip regulator provides extremely
18+
compact, high efficiency power-delivery solutions with high-precision
19+
output voltages and excellent transient response.
20+
21+
Datasheets:
22+
https://datasheets.maximintegrated.com/en/ds/MAX20730.pdf
23+
https://datasheets.maximintegrated.com/en/ds/MAX20734.pdf
24+
https://datasheets.maximintegrated.com/en/ds/MAX20743.pdf
25+
26+
properties:
27+
compatible:
28+
enum:
29+
- maxim,max20730
30+
- maxim,max20734
31+
- maxim,max20743
32+
33+
reg:
34+
maxItems: 1
35+
36+
vout-voltage-divider:
37+
description: |
38+
If voltage divider present at vout, the voltage at voltage sensor pin
39+
will be scaled. The properties will convert the raw reading to a more
40+
meaningful number if voltage divider present. It has two numbers,
41+
the first number is the output resistor, the second number is the total
42+
resistance. Therefore, the adjusted vout is equal to
43+
Vout = Vout * output_resistance / total resistance.
44+
$ref: /schemas/types.yaml#/definitions/uint32-array
45+
minItems: 2
46+
maxItems: 2
47+
48+
required:
49+
- compatible
50+
- reg
51+
52+
additionalProperties: false
53+
54+
examples:
55+
- |
56+
i2c {
57+
#address-cells = <1>;
58+
#size-cells = <0>;
59+
60+
max20730@10 {
61+
compatible = "maxim,max20730";
62+
reg = <0x10>;
63+
vout-voltage-divider = <1000 2000>; // vout would be scaled to 0.5
64+
};
65+
};

‎Documentation/devicetree/bindings/hwmon/moortec,mr75203.yaml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/moortec,mr75203.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Moortec Semiconductor MR75203 PVT Controller bindings
8+
9+
maintainers:
10+
- Rahul Tanwar <rtanwar@maxlinear.com>
11+
12+
properties:
13+
compatible:
14+
const: moortec,mr75203
15+
16+
reg:
17+
items:
18+
- description: PVT common registers
19+
- description: PVT temprature sensor registers
20+
- description: PVT process detector registers
21+
- description: PVT voltage monitor registers
22+
23+
reg-names:
24+
items:
25+
- const: common
26+
- const: ts
27+
- const: pd
28+
- const: vm
29+
30+
intel,vm-map:
31+
description:
32+
PVT controller has 5 VM (voltage monitor) sensors.
33+
vm-map defines CPU core to VM instance mapping. A
34+
value of 0xff means that VM sensor is unused.
35+
$ref: /schemas/types.yaml#definitions/uint8-array
36+
maxItems: 5
37+
38+
clocks:
39+
maxItems: 1
40+
41+
resets:
42+
maxItems: 1
43+
44+
"#thermal-sensor-cells":
45+
const: 1
46+
47+
required:
48+
- compatible
49+
- reg
50+
- reg-names
51+
- intel,vm-map
52+
- clocks
53+
- resets
54+
- "#thermal-sensor-cells"
55+
56+
additionalProperties: false
57+
58+
examples:
59+
- |
60+
pvt: pvt@e0680000 {
61+
compatible = "moortec,mr75203";
62+
reg = <0xe0680000 0x80>,
63+
<0xe0680080 0x180>,
64+
<0xe0680200 0x200>,
65+
<0xe0680400 0xc00>;
66+
reg-names = "common", "ts", "pd", "vm";
67+
intel,vm-map = [03 01 04 ff ff];
68+
clocks = <&osc0>;
69+
resets = <&rcu0 0x40 7>;
70+
#thermal-sensor-cells = <1>;
71+
};

‎Documentation/devicetree/bindings/hwmon/sensirion,shtc1.yaml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/sensirion,shtc1.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Sensirion SHTC1 Humidity and Temperature Sensor IC
8+
9+
maintainers:
10+
- Christopher Ruehl chris.ruehl@gtsys.com.hk
11+
12+
description: |
13+
The SHTC1, SHTW1 and SHTC3 are digital humidity and temperature sensor
14+
designed especially for battery-driven high-volume consumer electronics
15+
applications.
16+
For further information refere to Documentation/hwmon/shtc1.rst
17+
18+
This binding document describes the binding for the hardware monitor
19+
portion of the driver.
20+
21+
properties:
22+
compatible:
23+
enum:
24+
- sensirion,shtc1
25+
- sensirion,shtw1
26+
- sensirion,shtc3
27+
28+
reg:
29+
const: 0x70
30+
31+
sensirion,blocking-io:
32+
$ref: /schemas/types.yaml#definitions/flag
33+
description:
34+
If set, the driver hold the i2c bus until measurement is finished.
35+
36+
sensirion,low-precision:
37+
$ref: /schemas/types.yaml#definitions/flag
38+
description:
39+
If set, the sensor aquire data with low precision (not recommended).
40+
The driver aquire data with high precision by default.
41+
42+
required:
43+
- compatible
44+
- reg
45+
46+
additionalProperties: false
47+
48+
examples:
49+
- |
50+
i2c {
51+
#address-cells = <1>;
52+
#size-cells = <0>;
53+
clock-frequency = <400000>;
54+
55+
shtc3@70 {
56+
compatible = "sensirion,shtc3";
57+
reg = <0x70>;
58+
sensirion,blocking-io;
59+
};
60+
};
61+
...

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ properties:
8080
- fsl,mpl3115
8181
# MPR121: Proximity Capacitive Touch Sensor Controller
8282
- fsl,mpr121
83+
# Monolithic Power Systems Inc. multi-phase controller mp2975
84+
- mps,mp2975
8385
# G751: Digital Temperature Sensor and Thermal Watchdog with Two-Wire Interface
8486
- gmt,g751
8587
# Infineon IR38064 Voltage Regulator

0 commit comments

Comments
 (0)