-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'hwmon-for-v6.9' of git://git.kernel.org/pub/scm/linux/kern…
…el/git/groeck/linux-staging Pull hwmon updates from Guenter Roeck: "New drivers: - Amphenol ChipCap 2 - ASPEED g6 PWM/Fan tach - Astera Labs PT5161L retimer - ASUS ROG RYUJIN II 360 AIO cooler - LTC4282 - Microsoft Surface devices - MPS MPQ8785 Synchronous Step-Down Converter - NZXT Kraken X and Z series AIO CPU coolers Additional chip support in existing drivers: - Ayaneo Air Plus 7320u (oxp-sensors) - INA260 (ina2xx) - XPS 9315 (dell-smm) - MSI customer ID (nct6683) Devicetree bindings updates: - Common schema for hardware monitoring devices - Common schema for fans - Update chip descriptions to use common schema - Document regulator properties in several drivers - Explicit bindings for infineon buck converters Other improvements: - Replaced rbtree with maple tree register cache in several drivers - Added support for humidity min/max alarm and volatage fault attributes to hwmon core - Dropped non-functional I2C_CLASS_HWMON support for drivers w/o detect() - Dropped obsolete and redundant entried from MAINTAINERS - Cleaned up axi-fan-control and coretemp drivers - Minor fixes and improvements in several other drivers" * tag 'hwmon-for-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (70 commits) hwmon: (dell-smm) Add XPS 9315 to fan control whitelist hwmon: (aspeed-g6-pwm-tacho): Support for ASPEED g6 PWM/Fan tach dt-bindings: hwmon: Support Aspeed g6 PWM TACH Control dt-bindings: hwmon: fan: Add fan binding to schema dt-bindings: hwmon: tda38640: Add interrupt & regulator properties hwmon: (amc6821) add of_match table dt-bindings: hwmon: lm75: use common hwmon schema hwmon: (sis5595) drop unused DIV_TO_REG function dt-bindings: hwmon: reference common hwmon schema dt-bindings: hwmon: lltc,ltc4286: use common hwmon schema dt-bindings: hwmon: adi,adm1275: use common hwmon schema dt-bindings: hwmon: ti,ina2xx: use common hwmon schema dt-bindings: hwmon: add common properties hwmon: (pmbus/ir38064) Use PMBUS_REGULATOR_ONE to declare regulator hwmon: (pmbus/lm25066) Use PMBUS_REGULATOR_ONE to declare regulator hwmon: (pmbus/tda38640) Use PMBUS_REGULATOR_ONE to declare regulator regulator: dt-bindings: promote infineon buck converters to their own binding dt-bindings: hwmon/pmbus: ti,lm25066: document regulators dt-bindings: hwmon: nuvoton,nct6775: Add compatible value for NCT6799 MAINTAINERS: Drop redundant hwmon entries ...
- Loading branch information
Showing
89 changed files
with
7,137 additions
and
336 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
159 changes: 159 additions & 0 deletions
159
Documentation/devicetree/bindings/hwmon/adi,ltc4282.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,159 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/hwmon/adi,ltc4282.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Analog Devices LTC4282 I2C High Current Hot Swap Controller over I2C | ||
|
||
maintainers: | ||
- Nuno Sa <nuno.sa@analog.com> | ||
|
||
description: | | ||
Analog Devices LTC4282 I2C High Current Hot Swap Controller over I2C. | ||
https://www.analog.com/media/en/technical-documentation/data-sheets/ltc4282.pdf | ||
properties: | ||
compatible: | ||
enum: | ||
- adi,ltc4282 | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
vdd-supply: true | ||
|
||
clocks: | ||
maxItems: 1 | ||
|
||
'#clock-cells': | ||
const: 0 | ||
|
||
adi,rsense-nano-ohms: | ||
description: Value of the sense resistor. | ||
|
||
adi,vin-mode-microvolt: | ||
description: | ||
Selects operating range for the Undervoltage, Overvoltage and Foldback | ||
pins. Also for the ADC. Should be set to the nominal input voltage. | ||
enum: [3300000, 5000000, 12000000, 24000000] | ||
default: 12000000 | ||
|
||
adi,fet-bad-timeout-ms: | ||
description: | ||
From the moment a FET bad conditions is present, this property selects the | ||
wait time/timeout for a FET-bad fault to be signaled. Setting this to 0, | ||
disables FET bad faults to be reported. | ||
default: 255 | ||
maximum: 255 | ||
|
||
adi,overvoltage-dividers: | ||
description: | | ||
Select which dividers to use for VDD Overvoltage detection. Note that | ||
when the internal dividers are used the threshold is referenced to VDD. | ||
The percentages in the datasheet are misleading since the actual values | ||
to look for are in the "Absolute Maximum Ratings" table in the | ||
"Comparator Inputs" section. In there there's a line for each of the 5%, | ||
10% and 15% settings with the actual min, typical and max tolerances. | ||
$ref: /schemas/types.yaml#/definitions/string | ||
enum: [external, vdd_5_percent, vdd_10_percent, vdd_15_percent] | ||
default: external | ||
|
||
adi,undervoltage-dividers: | ||
description: | | ||
Select which dividers to use for VDD Overvoltage detection. Note that | ||
when the internal dividers are used the threshold is referenced to VDD. | ||
The percentages in the datasheet are misleading since the actual values | ||
to look for are in the "Absolute Maximum Ratings" table in the | ||
"Comparator Inputs" section. In there there's a line for each of the 5%, | ||
10% and 15% settings with the actual min, typical and max tolerances. | ||
$ref: /schemas/types.yaml#/definitions/string | ||
enum: [external, vdd_5_percent, vdd_10_percent, vdd_15_percent] | ||
default: external | ||
|
||
adi,current-limit-sense-microvolt: | ||
description: | ||
The current limit sense voltage of the chip is adjustable between | ||
12.5mV and 34.4mV in 3.1mV steps. This effectively limits the current | ||
on the load. | ||
enum: [12500, 15625, 18750, 21875, 25000, 28125, 31250, 34375] | ||
default: 25000 | ||
|
||
adi,overcurrent-retry: | ||
description: | ||
If set, enables the chip to auto-retry 256 timer cycles after an | ||
Overcurrent fault. | ||
type: boolean | ||
|
||
adi,overvoltage-retry-disable: | ||
description: | ||
If set, disables the chip to auto-retry 50ms after an Overvoltage fault. | ||
It's enabled by default. | ||
type: boolean | ||
|
||
adi,undervoltage-retry-disable: | ||
description: | ||
If set, disables the chip to auto-retry 50ms after an Undervoltage fault. | ||
It's enabled by default. | ||
type: boolean | ||
|
||
adi,fault-log-enable: | ||
description: | ||
If set, enables the FAULT_LOG and ADC_ALERT_LOG registers to be written | ||
to the EEPROM when a fault bit transitions high and hence, will be | ||
available after a power cycle (the chip loads the contents of | ||
the EE_FAULT_LOG register - the one in EEPROM - into FAULT_LOG at boot). | ||
type: boolean | ||
|
||
adi,gpio1-mode: | ||
description: Defines the function of the Pin. It can indicate that power is | ||
good (PULL the pin low when power is not good) or that power is bad (Go | ||
into high-z when power is not good). | ||
$ref: /schemas/types.yaml#/definitions/string | ||
enum: [power_bad, power_good] | ||
default: power_good | ||
|
||
adi,gpio2-mode: | ||
description: Defines the function of the Pin. It can be set as the input for | ||
the ADC or indicating that the MOSFET is in stress (dissipating power). | ||
$ref: /schemas/types.yaml#/definitions/string | ||
enum: [adc_input, stress_fet] | ||
default: adc_input | ||
|
||
adi,gpio3-monitor-enable: | ||
description: If set, gpio3 is set as input for the ADC instead of gpio2. | ||
type: boolean | ||
|
||
allOf: | ||
- if: | ||
required: | ||
- adi,gpio3-monitor-enable | ||
then: | ||
properties: | ||
adi,gpio2-mode: | ||
const: stress_fet | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- adi,rsense-nano-ohms | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
i2c { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
hwmon@50 { | ||
compatible = "adi,ltc4282"; | ||
reg = <0x50>; | ||
adi,rsense-nano-ohms = <500>; | ||
adi,gpio1-mode = "power_good"; | ||
adi,gpio2-mode = "adc_input"; | ||
}; | ||
}; | ||
... |
77 changes: 77 additions & 0 deletions
77
Documentation/devicetree/bindings/hwmon/amphenol,chipcap2.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/hwmon/amphenol,chipcap2.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: ChipCap 2 humidity and temperature iio sensor | ||
|
||
maintainers: | ||
- Javier Carrasco <javier.carrasco.cruz@gmail.com> | ||
|
||
description: | | ||
Relative humidity and temperature sensor on I2C bus. | ||
Datasheets: | ||
https://www.amphenol-sensors.com/en/telaire/humidity/527-humidity-sensors/3095-chipcap-2 | ||
properties: | ||
compatible: | ||
oneOf: | ||
- const: amphenol,cc2d23 | ||
- items: | ||
- enum: | ||
- amphenol,cc2d23s | ||
- amphenol,cc2d25 | ||
- amphenol,cc2d25s | ||
- amphenol,cc2d33 | ||
- amphenol,cc2d33s | ||
- amphenol,cc2d35 | ||
- amphenol,cc2d35s | ||
- const: amphenol,cc2d23 | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
items: | ||
- description: measurement ready indicator | ||
- description: low humidity alarm | ||
- description: high humidity alarm | ||
|
||
interrupt-names: | ||
items: | ||
- const: ready | ||
- const: low | ||
- const: high | ||
|
||
vdd-supply: | ||
description: | ||
Dedicated, controllable supply-regulator to reset the device and | ||
enter in command mode. | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- vdd-supply | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/interrupt-controller/irq.h> | ||
i2c { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
humidity@28 { | ||
compatible = "amphenol,cc2d23s", "amphenol,cc2d23"; | ||
reg = <0x28>; | ||
interrupt-parent = <&gpio>; | ||
interrupts = <4 IRQ_TYPE_EDGE_RISING>, | ||
<5 IRQ_TYPE_EDGE_RISING>, | ||
<6 IRQ_TYPE_EDGE_RISING>; | ||
interrupt-names = "ready", "low", "high"; | ||
vdd-supply = <®_vdd>; | ||
}; | ||
}; |
Oops, something went wrong.