Skip to content

Commit fd27687

Browse files
committed
Merge tag 'hwmon-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck: "New drivers: - Texas Instruments TMP464 and TMP468 driver - Vicor PLI1209BC Digital Supervisor driver - ASUS EC driver Improvements to existing drivers: - adt7x10: - Convert to use regmap - convert to use with_info API - use hwmon_notify_event - other cleanup - aquacomputer_d5next: - Add support for Aquacomputer Farbwerk 360 - asus_wmi_sensors: - Add ASUS ROG STRIX B450-F GAMING II - asus_wmi_ec_sensors: - Support T_Sensor on Prime X570-Pro - Deprecate driver (replaced by new driver) - axi-fan-control: - Use hwmon_notify_event - dell-smm: - Clean up CONFIG_I8K - disable fan type support for Inspiron 3505 - various other cleanup - hwmon core: - Report attribute name with udev events - Add "label" attribute to ABI, - Add support for pwm auto channels attribute - max6639: - Add regulator support - lm70: - Add support for TI TMP125 - lm83: - Cleanup, convert to use with_info API - mlxreg-fan: - Use pwm attribute for setting fan speed low limit - nct6775: - Add board ID's for ASUS ROG STRIX Z390/Z490/X570-* / PRIME X570-P, PRIME B550-PLUS, ASUS Pro B550M-C/PRIME B550M-A - Add support for TSI temperature registers - occ: - Add various new sysfs attributes - pmbus core: - Handle VIN unit off status - Add regulator supply into macro - Add get_error_flags support to regulator ops - pmbus/adm1275: - Allow setting sample averaging - pmbus/lm25066: - Add regulator support - pmbus/xdpe12284: - Add support for xdpe11280 - register as regulator - powr1220: - Convert to with_info API - Add support for Lattice's POWR1014 power manager IC - sch56xx: - Cleanup and minor improvements - sch5627: - Add pwmX_auto_channels_temp support - tc654: - Add thermal_cooling device support" * tag 'hwmon-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (86 commits) hwmon: (dell-smm) Add Inspiron 3505 to fan type blacklist hwmon: (pmbus) Add Vin unit off handling hwmon: (scpi-hwmon): Use of_device_get_match_data() hwmon: (axi-fan-control) Use hwmon_notify_event hwmon: (vexpress-hwmon) Use of_device_get_match_data() hwmon: Add driver for Texas Instruments TMP464 and TMP468 dt-bindings: hwmon: add tmp464.yaml dt-bindings: hwmon: Add sample averaging properties for ADM1275 hwmon: (adm1275) Allow setting sample averaging hwmon: (xdpe12284) Add regulator support hwmon: (xdpe12284) Add support for xdpe11280 dt-bindings: trivial-devices: Add xdpe11280 hwmon: (aquacomputer_d5next) Add support for Aquacomputer Farbwerk 360 hwmon: (sch5627) Add pwmX_auto_channels_temp support hwmon: (core) Add support for pwm auto channels attribute hwmon: (lm70) Add ti,tmp125 support dt-bindings: Add ti,tmp125 temperature sensor binding hwmon: (pmbus/pli1209bc) Add regulator support hwmon: (pmbus) Add support for pli1209bc dt-bindings:trivial-devices: Add pli1209bc ...
2 parents d347ee5 + 6ba463e commit fd27687

59 files changed

Lines changed: 4155 additions & 971 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
What: /proc/i8k
2+
Date: November 2001
3+
KernelVersion: 2.4.14
4+
Contact: Pali Rohár <pali@kernel.org>
5+
Description: Legacy interface for getting/setting sensor information like
6+
fan speed, temperature, serial number, hotkey status etc
7+
on Dell Laptops.
8+
Since the driver is now using the standard hwmon sysfs interface,
9+
the procfs interface is deprecated.
10+
Users: https://github.com/vitorafsr/i8kutils

Documentation/ABI/testing/sysfs-class-hwmon

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ Description:
99

1010
RO
1111

12+
What: /sys/class/hwmon/hwmonX/label
13+
Description:
14+
A descriptive label that allows to uniquely identify a
15+
device within the system.
16+
The contents of the label are free-form.
17+
18+
RO
19+
1220
What: /sys/class/hwmon/hwmonX/update_interval
1321
Description:
1422
The interval at which the chip will update readings.

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,30 @@
944944
dump out devices still on the deferred probe list after
945945
retrying.
946946

947+
dell_smm_hwmon.ignore_dmi=
948+
[HW] Continue probing hardware even if DMI data
949+
indicates that the driver is running on unsupported
950+
hardware.
951+
952+
dell_smm_hwmon.force=
953+
[HW] Activate driver even if SMM BIOS signature does
954+
not match list of supported models and enable otherwise
955+
blacklisted features.
956+
957+
dell_smm_hwmon.power_status=
958+
[HW] Report power status in /proc/i8k
959+
(disabled by default).
960+
961+
dell_smm_hwmon.restricted=
962+
[HW] Allow controlling fans only if SYS_ADMIN
963+
capability is set.
964+
965+
dell_smm_hwmon.fan_mult=
966+
[HW] Factor to multiply fan speed with.
967+
968+
dell_smm_hwmon.fan_max=
969+
[HW] Maximum configurable fan speed.
970+
947971
dfltcc= [HW,S390]
948972
Format: { on | off | def_only | inf_only | always }
949973
on: s390 zlib hardware support for compression on
@@ -1703,17 +1727,6 @@
17031727

17041728
i810= [HW,DRM]
17051729

1706-
i8k.ignore_dmi [HW] Continue probing hardware even if DMI data
1707-
indicates that the driver is running on unsupported
1708-
hardware.
1709-
i8k.force [HW] Activate i8k driver even if SMM BIOS signature
1710-
does not match list of supported models.
1711-
i8k.power_status
1712-
[HW] Report power status in /proc/i8k
1713-
(disabled by default)
1714-
i8k.restricted [HW] Allow controlling fans only if SYS_ADMIN
1715-
capability is set.
1716-
17171730
i915.invert_brightness=
17181731
[DRM] Invert the sense of the variable that is used to
17191732
set the brightness of the panel backlight. Normally a

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

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,72 @@ properties:
3737
description:
3838
Shunt resistor value in micro-Ohm.
3939

40+
adi,volt-curr-sample-average:
41+
description: |
42+
Number of samples to be used to report voltage and current values.
43+
$ref: /schemas/types.yaml#/definitions/uint32
44+
enum: [1, 2, 4, 8, 16, 32, 64, 128]
45+
46+
adi,power-sample-average:
47+
description: |
48+
Number of samples to be used to report power values.
49+
$ref: /schemas/types.yaml#/definitions/uint32
50+
enum: [1, 2, 4, 8, 16, 32, 64, 128]
51+
52+
allOf:
53+
- if:
54+
properties:
55+
compatible:
56+
contains:
57+
enum:
58+
- adi,adm1075
59+
- adi,adm1276
60+
then:
61+
properties:
62+
adi,volt-curr-sample-average:
63+
default: 128
64+
adi,power-sample-average: false
65+
66+
- if:
67+
properties:
68+
compatible:
69+
contains:
70+
enum:
71+
- adi,adm1275
72+
then:
73+
properties:
74+
adi,volt-curr-sample-average:
75+
default: 16
76+
adi,power-sample-average: false
77+
78+
- if:
79+
properties:
80+
compatible:
81+
contains:
82+
enum:
83+
- adi,adm1272
84+
then:
85+
properties:
86+
adi,volt-curr-sample-average:
87+
default: 128
88+
adi,power-sample-average:
89+
default: 128
90+
91+
- if:
92+
properties:
93+
compatible:
94+
contains:
95+
enum:
96+
- adi,adm1278
97+
- adi,adm1293
98+
- adi,adm1294
99+
then:
100+
properties:
101+
adi,volt-curr-sample-average:
102+
default: 128
103+
adi,power-sample-average:
104+
default: 1
105+
40106
required:
41107
- compatible
42108
- reg
@@ -53,5 +119,7 @@ examples:
53119
compatible = "adi,adm1272";
54120
reg = <0x10>;
55121
shunt-resistor-micro-ohms = <500>;
122+
adi,volt-curr-sample-average = <128>;
123+
adi,power-sample-average = <128>;
56124
};
57125
};

Documentation/devicetree/bindings/hwmon/national,lm90.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ additionalProperties: false
6060

6161
examples:
6262
- |
63-
#include <dt-bindings/gpio/tegra-gpio.h>
6463
#include <dt-bindings/interrupt-controller/irq.h>
6564
6665
i2c {
@@ -71,8 +70,7 @@ examples:
7170
compatible = "onnn,nct1008";
7271
reg = <0x4c>;
7372
vcc-supply = <&palmas_ldo6_reg>;
74-
interrupt-parent = <&gpio>;
75-
interrupts = <TEGRA_GPIO(O, 4) IRQ_TYPE_LEVEL_LOW>;
73+
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
7674
#thermal-sensor-cells = <1>;
7775
};
7876
};
Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/ti,tmp464.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: TMP464 and TMP468 temperature sensors
8+
9+
maintainers:
10+
- Agathe Porte <agathe.porte@nokia.com>
11+
12+
description: |
13+
±0.0625°C Remote and Local temperature sensor
14+
https://www.ti.com/lit/ds/symlink/tmp464.pdf
15+
https://www.ti.com/lit/ds/symlink/tmp468.pdf
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- ti,tmp464
21+
- ti,tmp468
22+
23+
reg:
24+
maxItems: 1
25+
26+
'#address-cells':
27+
const: 1
28+
29+
'#size-cells':
30+
const: 0
31+
32+
required:
33+
- compatible
34+
- reg
35+
36+
additionalProperties: false
37+
38+
patternProperties:
39+
"^channel@([0-8])$":
40+
type: object
41+
description: |
42+
Represents channels of the device and their specific configuration.
43+
44+
properties:
45+
reg:
46+
description: |
47+
The channel number. 0 is local channel, 1-8 are remote channels.
48+
items:
49+
minimum: 0
50+
maximum: 8
51+
52+
label:
53+
description: |
54+
A descriptive name for this channel, like "ambient" or "psu".
55+
56+
ti,n-factor:
57+
description: |
58+
The value (two's complement) to be programmed in the channel specific N correction register.
59+
For remote channels only.
60+
$ref: /schemas/types.yaml#/definitions/int32
61+
items:
62+
minimum: -128
63+
maximum: 127
64+
65+
required:
66+
- reg
67+
68+
additionalProperties: false
69+
70+
examples:
71+
- |
72+
i2c {
73+
#address-cells = <1>;
74+
#size-cells = <0>;
75+
76+
sensor@4b {
77+
compatible = "ti,tmp464";
78+
reg = <0x4b>;
79+
};
80+
};
81+
- |
82+
i2c {
83+
#address-cells = <1>;
84+
#size-cells = <0>;
85+
86+
sensor@4b {
87+
compatible = "ti,tmp464";
88+
reg = <0x4b>;
89+
#address-cells = <1>;
90+
#size-cells = <0>;
91+
92+
channel@0 {
93+
reg = <0x0>;
94+
label = "local";
95+
};
96+
97+
channel@1 {
98+
reg = <0x1>;
99+
ti,n-factor = <(-10)>;
100+
label = "external";
101+
};
102+
103+
channel@2 {
104+
reg = <0x2>;
105+
ti,n-factor = <0x10>;
106+
label = "somelabel";
107+
};
108+
109+
channel@3 {
110+
reg = <0x3>;
111+
status = "disabled";
112+
};
113+
};
114+
};

Documentation/devicetree/bindings/trivial-devices.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ properties:
137137
- infineon,slb9645tt
138138
# Infineon TLV493D-A1B6 I2C 3D Magnetic Sensor
139139
- infineon,tlv493d-a1b6
140+
# Infineon Multi-phase Digital VR Controller xdpe11280
141+
- infineon,xdpe11280
140142
# Infineon Multi-phase Digital VR Controller xdpe12254
141143
- infineon,xdpe12254
142144
# Infineon Multi-phase Digital VR Controller xdpe12284
@@ -337,6 +339,7 @@ properties:
337339
# Thermometer with SPI interface
338340
- ti,tmp121
339341
- ti,tmp122
342+
- ti,tmp125
340343
# Digital Temperature Sensor
341344
- ti,tmp275
342345
# TI DC-DC converter on PMBus
@@ -354,6 +357,8 @@ properties:
354357
- ti,tps544c25
355358
# Winbond/Nuvoton H/W Monitor
356359
- winbond,w83793
360+
# Vicor Corporation Digital Supervisor
361+
- vicor,pli1209bc
357362
# i2c trusted platform module (TPM)
358363
- winbond,wpct301
359364

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,6 +1298,8 @@ patternProperties:
12981298
description: Vertexcom Technologies, Inc.
12991299
"^via,.*":
13001300
description: VIA Technologies, Inc.
1301+
"^vicor,.*":
1302+
description: Vicor Corporation
13011303
"^videostrong,.*":
13021304
description: Videostrong Technology Co., Ltd.
13031305
"^virtio,.*":

0 commit comments

Comments
 (0)