On Tue, Sep 21, 2021 at 12:28:29PM +0200, Krzysztof Kozlowski wrote:
> 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@xxxxxxxxxxxxx>
> Reviewed-by: Rob Herring <robh@xxxxxxxxxx>
Following Rob's suggestion:
"... I'd much rather have a schema for these than wait on
someone to decide to convert them. That could mean a device.txt ->
trivial-devices.yaml -> device.yaml trip, but that doesn't seem that
terrible to me. Then we at least are running schema checks on the
devices and know if actual users have more undocumented properties."
Applied.
Thanks,
Guenter
> ---
> .../devicetree/bindings/hwmon/ibm,cffps1.txt | 26 -------------------
> .../devicetree/bindings/trivial-devices.yaml | 6 +++++
> MAINTAINERS | 1 -
> 3 files changed, 6 insertions(+), 27 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
>
> 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 15c4d3c809e8..cc5df54bdc51 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -14956,7 +14956,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
