Skip to content

Commit a4910ed

Browse files
committed
Merge tag 'hwmon-for-v6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck: "New drivers: - PMBus client driver for Intel CRPS185 power supply - PMBus client driver for Texas Instruments TPS25990 Chip support added to existing drivers: - pmbus/max15301: Add support for MAX15303 - pmbus/adm1275: Add adm1273 support - lm75: Add NXP P3T1755 support; with it, add I3C support to the driver - asus-ec-sensors: Add TUF GAMING X670E PLUS Other notable changes: - nct6683: Add customer IDs for several MSI and ASRock boards - tmp108: Add regulator support - Improve write protect support in PMBus core - pmbus/dps920ab: Add ability to instantiate through i2c - The hwmon core now accepts NULL as device name parameter to [devm_]hwmon_device_register_with_info ans uses the parent device name as fallback in that case - The PMBus core now provides the PMBUs revision in a debugfs file - asus-ec-sensors: Support for optional CPU fan on AMD 600 motherboards - raspberrypi: Add PM suspend/resume support - dell-smm: Enable manual fan control support on Dell XPS 9370 - pwm-fan: Default to maximum cooling level if provided And various other minor fixes and improvements" * tag 'hwmon-for-v6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (44 commits) hwmon: pmbus: dps920ab: Add ability to instantiate through i2c hwmon: (pwm-fan) Default to the Maximum cooling level if provided hwmon: (asus_atk0110) Use str_enabled_disabled() and str_enable_disable() helpers hwmon: Fix help text for aspeed-g6-pwm-tach hwmon: (dell-smm) Add Dell XPS 9370 to fan control whitelist hwmon: (acpi_power_meter) Fix update the power trip points on failure hwmon: (acpi_power_meter) Fix uninitialized variables hwmon: (core) Use device name as a fallback in devm_hwmon_device_register_with_info hwmon: (pmbus/max15301) Add support for MAX15303 hwmon: (pmbus/adm1275) add adm1273 support dt-bindings: hwmon: adm1275: add adm1273 hwmon: (nct6683) Add another customer ID for MSI hwmon: (pwm-fan): Make use of device properties everywhere hwmon: (lm75) add I3C support for P3T1755 hwmon: (lm75) separate probe into common and I2C parts hwmon: (lm75) Remove superfluous 'client' member from private struct hwmon: (lm75) simplify regulator handling hwmon: (lm75) simplify lm75_write_config() hwmon: (lm75) Hide register size differences in regmap access functions hwmon: (pmbus/crps) Add Intel CRPS185 power supply ...
2 parents 11a7b03 + a76539b commit a4910ed

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

+1378
-268
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ properties:
2424
enum:
2525
- adi,adm1075
2626
- adi,adm1272
27+
- adi,adm1273
2728
- adi,adm1275
2829
- adi,adm1276
2930
- adi,adm1278
@@ -79,6 +80,7 @@ allOf:
7980
contains:
8081
enum:
8182
- adi,adm1272
83+
- adi,adm1273
8284
then:
8385
properties:
8486
adi,volt-curr-sample-average:

Documentation/devicetree/bindings/hwmon/lm75.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ properties:
2828
- maxim,max31725
2929
- maxim,max31726
3030
- maxim,mcp980x
31+
- nxp,p3t1755
3132
- nxp,pct2075
3233
- st,stds75
3334
- st,stlm75

Documentation/devicetree/bindings/trivial-devices.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ properties:
149149
- injoinic,ip5209
150150
# Inspur Power System power supply unit version 1
151151
- inspur,ipsps1
152+
# Intel common redudant power supply crps185
153+
- intel,crps185
152154
# Intersil ISL29028 Ambient Light and Proximity Sensor
153155
- isil,isl29028
154156
# Intersil ISL29030 Ambient Light and Proximity Sensor

Documentation/hwmon/adm1275.rst

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ Supported chips:
1919

2020
Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1272.pdf
2121

22+
* Analog Devices ADM1273
23+
24+
Prefix: 'adm1273'
25+
26+
Addresses scanned: -
27+
28+
Datasheet: Not yet publicly available
29+
2230
* Analog Devices ADM1275
2331

2432
Prefix: 'adm1275'
@@ -66,14 +74,14 @@ Description
6674
-----------
6775

6876
This driver supports hardware monitoring for Analog Devices ADM1075, ADM1272,
69-
ADM1275, ADM1276, ADM1278, ADM1281, ADM1293, and ADM1294 Hot-Swap Controller and
70-
Digital Power Monitors.
77+
ADM1273, ADM1275, ADM1276, ADM1278, ADM1281, ADM1293, and ADM1294 Hot-Swap
78+
Controller and Digital Power Monitors.
7179

72-
ADM1075, ADM1272, ADM1275, ADM1276, ADM1278, ADM1281, ADM1293, and ADM1294 are hot-swap
73-
controllers that allow a circuit board to be removed from or inserted into
74-
a live backplane. They also feature current and voltage readback via an
75-
integrated 12 bit analog-to-digital converter (ADC), accessed using a
76-
PMBus interface.
80+
ADM1075, ADM1272, ADM1273, ADM1275, ADM1276, ADM1278, ADM1281, ADM1293, and
81+
ADM1294 are hot-swap controllers that allow a circuit board to be removed from
82+
or inserted into a live backplane. They also feature current and voltage
83+
readback via an integrated 12 bit analog-to-digital converter (ADC), accessed
84+
using a PMBus interface.
7785

7886
The driver is a client driver to the core PMBus driver. Please see
7987
Documentation/hwmon/pmbus.rst for details on PMBus client drivers.
@@ -141,7 +149,7 @@ power1_input_highest Highest observed input power.
141149
power1_reset_history Write any value to reset history.
142150

143151
Power attributes are supported on ADM1075, ADM1272,
144-
ADM1276, ADM1293, and ADM1294.
152+
ADM1273, ADM1276, ADM1293, and ADM1294.
145153

146154
temp1_input Chip temperature.
147155
temp1_max Maximum chip temperature.
@@ -151,6 +159,6 @@ temp1_crit_alarm Critical temperature high alarm.
151159
temp1_highest Highest observed temperature.
152160
temp1_reset_history Write any value to reset history.
153161

154-
Temperature attributes are supported on ADM1272 and
155-
ADM1278, and ADM1281.
162+
Temperature attributes are supported on ADM1272,
163+
ADM1273, ADM1278, and ADM1281.
156164
======================= =======================================================

Documentation/hwmon/asus_ec_sensors.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Supported boards:
2929
* ROG STRIX Z690-A GAMING WIFI D4
3030
* ROG ZENITH II EXTREME
3131
* ROG ZENITH II EXTREME ALPHA
32+
* TUF GAMING X670E PLUS
3233

3334
Authors:
3435
- Eugene Shalygin <[email protected]>

Documentation/hwmon/crps.rst

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
.. SPDX-License-Identifier: GPL-2.0-or-later
2+
3+
Kernel driver crps
4+
==================
5+
6+
Supported chips:
7+
8+
* Intel CRPS185
9+
10+
Prefix: 'crps185'
11+
12+
Addresses scanned: -
13+
14+
Datasheet: Only available under NDA.
15+
16+
Authors:
17+
Ninad Palsule <[email protected]>
18+
19+
20+
Description
21+
-----------
22+
23+
This driver implements support for Intel Common Redundant Power supply with
24+
PMBus support.
25+
26+
The driver is a client driver to the core PMBus driver.
27+
Please see Documentation/hwmon/pmbus.rst for details on PMBus client drivers.
28+
29+
30+
Usage Notes
31+
-----------
32+
33+
This driver does not auto-detect devices. You will have to instantiate the
34+
devices explicitly. Please see Documentation/i2c/instantiating-devices.rst for
35+
details.
36+
37+
38+
Sysfs entries
39+
-------------
40+
41+
======================= ======================================================
42+
curr1_label "iin"
43+
curr1_input Measured input current
44+
curr1_max Maximum input current
45+
curr1_max_alarm Input maximum current high alarm
46+
curr1_crit Critial high input current
47+
curr1_crit_alarm Input critical current high alarm
48+
curr1_rated_max Maximum rated input current
49+
50+
curr2_label "iout1"
51+
curr2_input Measured output current
52+
curr2_max Maximum output current
53+
curr2_max_alarm Output maximum current high alarm
54+
curr2_crit Critial high output current
55+
curr2_crit_alarm Output critical current high alarm
56+
curr2_rated_max Maximum rated output current
57+
58+
in1_label "vin"
59+
in1_input Measured input voltage
60+
in1_crit Critical input over voltage
61+
in1_crit_alarm Critical input over voltage alarm
62+
in1_max Maximum input over voltage
63+
in1_max_alarm Maximum input over voltage alarm
64+
in1_rated_min Minimum rated input voltage
65+
in1_rated_max Maximum rated input voltage
66+
67+
in2_label "vout1"
68+
in2_input Measured input voltage
69+
in2_crit Critical input over voltage
70+
in2_crit_alarm Critical input over voltage alarm
71+
in2_lcrit Critical input under voltage fault
72+
in2_lcrit_alarm Critical input under voltage fault alarm
73+
in2_max Maximum input over voltage
74+
in2_max_alarm Maximum input over voltage alarm
75+
in2_min Minimum input under voltage warning
76+
in2_min_alarm Minimum input under voltage warning alarm
77+
in2_rated_min Minimum rated input voltage
78+
in2_rated_max Maximum rated input voltage
79+
80+
power1_label "pin"
81+
power1_input Measured input power
82+
power1_alarm Input power high alarm
83+
power1_max Maximum input power
84+
power1_rated_max Maximum rated input power
85+
86+
temp[1-2]_input Measured temperature
87+
temp[1-2]_crit Critical temperature
88+
temp[1-2]_crit_alarm Critical temperature alarm
89+
temp[1-2]_max Maximum temperature
90+
temp[1-2]_max_alarm Maximum temperature alarm
91+
temp[1-2]_rated_max Maximum rated temperature
92+
93+
fan1_alarm Fan 1 warning.
94+
fan1_fault Fan 1 fault.
95+
fan1_input Fan 1 speed in RPM.
96+
fan1_target Fan 1 target.
97+
======================= ======================================================

Documentation/hwmon/hwmon-kernel-api.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ hwmon_device_register_with_info.
6464

6565
All supported hwmon device registration functions only accept valid device
6666
names. Device names including invalid characters (whitespace, '*', or '-')
67-
will be rejected. The 'name' parameter is mandatory.
67+
will be rejected. If NULL is passed as name parameter, the hardware monitoring
68+
device name will be derived from the parent device name.
6869

6970
If the driver doesn't use a static device name (for example it uses
7071
dev_name()), and therefore cannot make sure the name only contains valid

Documentation/hwmon/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ Hardware Monitoring Kernel Drivers
5858
corsair-cpro
5959
corsair-psu
6060
cros_ec_hwmon
61+
crps
6162
da9052
6263
da9055
6364
dell-smm-hwmon
@@ -237,6 +238,7 @@ Hardware Monitoring Kernel Drivers
237238
tmp464
238239
tmp513
239240
tps23861
241+
tps25990
240242
tps40422
241243
tps53679
242244
tps546d24

Documentation/hwmon/isl28022.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ details.
3333

3434
The shunt value in micro-ohms, shunt voltage range and averaging can be set
3535
with device properties.
36-
Please refer to the Documentation/devicetree/bindings/hwmon/isl,isl28022.yaml
36+
Please refer to the Documentation/devicetree/bindings/hwmon/renesas,isl28022.yaml
3737
for bindings if the device tree is used.
3838

3939
The driver supports only shunt and bus continuous ADC mode at 15bit resolution.
@@ -48,6 +48,7 @@ The following attributes are supported. All attributes are read-only.
4848

4949
======================= =======================================================
5050
in0_input bus voltage (milli Volt)
51+
in1_input shunt voltage (milli Volt)
5152

5253
curr1_input current (milli Ampere)
5354
power1_input power (micro Watt)

Documentation/hwmon/lm75.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,17 @@ Supported chips:
121121

122122
https://www.ti.com/product/TMP1075
123123

124-
* NXP LM75B, PCT2075
124+
* NXP LM75B, P3T1755, PCT2075
125125

126-
Prefix: 'lm75b', 'pct2075'
126+
Prefix: 'lm75b', 'p3t1755', 'pct2075'
127127

128128
Addresses scanned: none
129129

130130
Datasheet: Publicly available at the NXP website
131131

132-
https://www.nxp.com/documents/data_sheet/LM75B.pdf
132+
https://www.nxp.com/docs/en/data-sheet/LM75B.pdf
133+
134+
https://www.nxp.com/docs/en/data-sheet/P3T1755.pdf
133135

134136
https://www.nxp.com/docs/en/data-sheet/PCT2075.pdf
135137

Documentation/hwmon/max15301.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ Supported chips:
1313

1414
Datasheet: https://datasheets.maximintegrated.com/en/ds/MAX15301.pdf
1515

16+
* Maxim MAX15303
17+
18+
Prefix: 'max15303'
19+
20+
Addresses scanned: -
21+
22+
Datasheet: https://www.analog.com/media/en/technical-documentation/data-sheets/max15303.pdf
23+
1624
Author: Erik Rosen <[email protected]>
1725

1826

Documentation/hwmon/nct6683.rst

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,16 @@ Tested Boards and Firmware Versions
5555
The driver has been reported to work with the following boards and
5656
firmware versions.
5757

58-
=============== ===============================================
59-
Board Firmware version
60-
=============== ===============================================
61-
Intel DH87RL NCT6683D EC firmware version 1.0 build 04/03/13
62-
Intel DH87MC NCT6683D EC firmware version 1.0 build 04/03/13
63-
Intel DB85FL NCT6683D EC firmware version 1.0 build 04/03/13
64-
ASRock X570 NCT6683D EC firmware version 1.0 build 06/28/19
65-
ASRock X670E NCT6686D EC firmware version 1.0 build 05/19/22
66-
MSI B550 NCT6687D EC firmware version 1.0 build 05/07/20
67-
MSI X670-P NCT6687D EC firmware version 0.0 build 09/27/22
68-
=============== ===============================================
58+
=============================== ===============================================
59+
Board Firmware version
60+
=============================== ===============================================
61+
Intel DH87RL NCT6683D EC firmware version 1.0 build 04/03/13
62+
Intel DH87MC NCT6683D EC firmware version 1.0 build 04/03/13
63+
Intel DB85FL NCT6683D EC firmware version 1.0 build 04/03/13
64+
ASRock X570 NCT6683D EC firmware version 1.0 build 06/28/19
65+
ASRock X670E NCT6686D EC firmware version 1.0 build 05/19/22
66+
ASRock B650 Steel Legend WiFi NCT6686D EC firmware version 1.0 build 11/09/23
67+
MSI B550 NCT6687D EC firmware version 1.0 build 05/07/20
68+
MSI X670-P NCT6687D EC firmware version 0.0 build 09/27/22
69+
MSI X870E NCT6687D EC firmware version 0.0 build 11/13/24
70+
=============================== ===============================================

Documentation/hwmon/pmbus-core.rst

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,10 @@ currently provides a flags field with four bits used::
312312

313313
#define PMBUS_USE_COEFFICIENTS_CMD BIT(5)
314314

315+
#define PMBUS_OP_PROTECTED BIT(6)
316+
317+
#define PMBUS_VOUT_PROTECTED BIT(7)
318+
315319
struct pmbus_platform_data {
316320
u32 flags; /* Device specific flags */
317321

@@ -373,3 +377,34 @@ PMBUS_USE_COEFFICIENTS_CMD
373377

374378
When this flag is set the PMBus core driver will use the COEFFICIENTS
375379
register to initialize the coefficients for the direct mode format.
380+
381+
PMBUS_OP_PROTECTED
382+
383+
Set if the chip OPERATION command is protected and protection is not
384+
determined by the standard WRITE_PROTECT command.
385+
386+
PMBUS_VOUT_PROTECTED
387+
388+
Set if the chip VOUT_COMMAND command is protected and protection is not
389+
determined by the standard WRITE_PROTECT command.
390+
391+
Module parameter
392+
----------------
393+
394+
pmbus_core.wp: PMBus write protect forced mode
395+
396+
PMBus may come up with a variety of write protection configuration.
397+
'pmbus_core.wp' may be used if a particular write protection is necessary.
398+
The ability to actually alter the protection may also depend on the chip
399+
so the actual runtime write protection configuration may differ from
400+
the requested one. pmbus_core currently support the following value:
401+
402+
* 0: write protection removed.
403+
* 1: Disable all writes except to the WRITE_PROTECT, OPERATION,
404+
PAGE, ON_OFF_CONFIG and VOUT_COMMAND commands.
405+
* 2: Disable all writes except to the WRITE_PROTECT, OPERATION and
406+
PAGE commands.
407+
* 3: Disable all writes except to the WRITE_PROTECT command. Note that
408+
protection should include the PAGE register. This may be problematic
409+
for multi-page chips, if the chips strictly follows the PMBus
410+
specification, preventing the chip from changing the active page.

0 commit comments

Comments
 (0)