diff options
| author | Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> | 2021-09-21 12:28:29 +0200 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2021-10-12 07:22:40 -0700 |
| commit | b4fb4676fb96336dc16c81fd45583bc006dfa791 (patch) | |
| tree | 87a431d29fa87e4276dbde8916a6afe48cd4ff79 | |
| parent | 7bcc5a7a5c2bf03e21bc2eea422b9ec5f6615e83 (diff) | |
| download | lwn-b4fb4676fb96336dc16c81fd45583bc006dfa791.tar.gz lwn-b4fb4676fb96336dc16c81fd45583bc006dfa791.zip | |
dt-bindings: hwmon: ibm,cffps: move to trivial devices
The IBM Common Form Factor Power Supply Versions 1 and 2 bindings are
trivial, so they can be integrated into trivial devices bindings.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20210921102832.143352-3-krzysztof.kozlowski@canonical.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| -rw-r--r-- | Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt | 26 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/trivial-devices.yaml | 6 | ||||
| -rw-r--r-- | MAINTAINERS | 1 |
3 files changed, 6 insertions, 27 deletions
diff --git a/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt b/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt deleted file mode 100644 index d9a2719f9243..000000000000 --- a/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt +++ /dev/null @@ -1,26 +0,0 @@ -Device-tree bindings for IBM Common Form Factor Power Supply Versions 1 and 2 ------------------------------------------------------------------------------ - -Required properties: - - compatible : Must be one of the following: - "ibm,cffps1" - "ibm,cffps2" - or "ibm,cffps" if the system - must support any version of the - power supply - - reg = < I2C bus address >; : Address of the power supply on the - I2C bus. - -Example: - - i2c-bus@100 { - #address-cells = <1>; - #size-cells = <0>; - #interrupt-cells = <1>; - < more properties > - - power-supply@68 { - compatible = "ibm,cffps1"; - reg = <0x68>; - }; - }; diff --git a/Documentation/devicetree/bindings/trivial-devices.yaml b/Documentation/devicetree/bindings/trivial-devices.yaml index 6ad0628741cf..791079021f1b 100644 --- a/Documentation/devicetree/bindings/trivial-devices.yaml +++ b/Documentation/devicetree/bindings/trivial-devices.yaml @@ -113,6 +113,12 @@ properties: - mps,mp2975 # Honeywell Humidicon HIH-6130 humidity/temperature sensor - honeywell,hi6130 + # IBM Common Form Factor Power Supply Versions (all versions) + - ibm,cffps + # IBM Common Form Factor Power Supply Versions 1 + - ibm,cffps1 + # IBM Common Form Factor Power Supply Versions 2 + - ibm,cffps2 # Infineon IR36021 digital POL buck controller - infineon,ir36021 # Infineon IR38064 Voltage Regulator diff --git a/MAINTAINERS b/MAINTAINERS index 918bc6f5526c..cc5eaf4e65dc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14910,7 +14910,6 @@ S: Maintained W: http://hwmon.wiki.kernel.org/ W: http://www.roeck-us.net/linux/drivers/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git -F: Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt F: Documentation/devicetree/bindings/hwmon/ltc2978.txt F: Documentation/devicetree/bindings/hwmon/max31785.txt F: Documentation/hwmon/adm1275.rst |