On Wed, Jan 25, 2023 at 11:28:17PM +0100, Heiner Kallweit wrote: > Convert Amlogic Meson PWM binding to yaml. > > Signed-off-by: Heiner Kallweit <hkallweit1@xxxxxxxxx> > --- > v2: > - fix clocks and clock-names > - consider that more than one compatible may be set > --- > .../devicetree/bindings/pwm/pwm-amlogic.yaml | 73 +++++++++++++++++++ > .../devicetree/bindings/pwm/pwm-meson.txt | 29 -------- > 2 files changed, 73 insertions(+), 29 deletions(-) > create mode 100644 Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml > delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt > > diff --git a/Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml b/Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml > new file mode 100644 > index 000000000..871b24bc2 > --- /dev/null > +++ b/Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml > @@ -0,0 +1,73 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/pwm/pwm-amlogic.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Amlogic PWM > + > +maintainers: > + - Heiner Kallweit <hkallweit1@xxxxxxxxx> > + > +allOf: > + - $ref: pwm.yaml# > + > +properties: > + compatible: > + minItems: 1 > + maxItems: 2 A fallback compatible shouldn't be optional. This makes 'amlogic,meson-gx-pwm' alone valid, for example. Though probably the dtschema processing will add minItems/maxItems on each oneOf entry to prevent that anyways. So just drop the minItems/maxItems here. > + oneOf: > + - items: > + - enum: > + - amlogic,meson8b-pwm > + - amlogic,meson-gxbb-pwm > + - amlogic,meson-gxbb-ao-pwm > + - amlogic,meson-axg-ee-pwm > + - amlogic,meson-axg-ao-pwm > + - amlogic,meson-g12a-ee-pwm > + - amlogic,meson-g12a-ao-pwm-ab > + - amlogic,meson-g12a-ao-pwm-cd > + - amlogic,meson-s4-pwm > + - items: > + - const: amlogic,meson-gx-pwm > + - const: amlogic,meson-gxbb-pwm > + - items: > + - const: amlogic,meson-gx-ao-pwm > + - const: amlogic,meson-gxbb-ao-pwm > + - items: > + - const: amlogic,meson8-pwm > + - const: amlogic,meson8b-pwm > + > + reg: > + maxItems: 1 > + > + clocks: > + minItems: 1 > + maxItems: 2 > + > + clock-names: > + oneOf: > + - items: > + - enum: [clkin0, clkin1] > + - items: > + - const: clkin0 > + - const: clkin1 > + > + "#pwm-cells": > + const: 3 > + > +required: > + - compatible > + - reg > + > +additionalProperties: false > + > +examples: > + - | > + pwm@8550 { > + compatible = "amlogic,meson-gxbb-pwm"; > + reg = <0x08550 0x10>; > + clocks = <&xtal>, <&xtal>; > + clock-names = "clkin0", "clkin1"; > + #pwm-cells = <3>; > + }; > diff --git a/Documentation/devicetree/bindings/pwm/pwm-meson.txt b/Documentation/devicetree/bindings/pwm/pwm-meson.txt > deleted file mode 100644 > index bd02b0a14..000000000 > --- a/Documentation/devicetree/bindings/pwm/pwm-meson.txt > +++ /dev/null > @@ -1,29 +0,0 @@ > -Amlogic Meson PWM Controller > -============================ > - > -Required properties: > -- compatible: Shall contain "amlogic,meson8b-pwm" > - or "amlogic,meson-gxbb-pwm" > - or "amlogic,meson-gxbb-ao-pwm" > - or "amlogic,meson-axg-ee-pwm" > - or "amlogic,meson-axg-ao-pwm" > - or "amlogic,meson-g12a-ee-pwm" > - or "amlogic,meson-g12a-ao-pwm-ab" > - or "amlogic,meson-g12a-ao-pwm-cd" > -- #pwm-cells: Should be 3. See pwm.yaml in this directory for a description of > - the cells format. > - > -Optional properties: > -- clocks: Could contain one or two parents clocks phandle for each of the two > - PWM channels. > -- clock-names: Could contain at least the "clkin0" and/or "clkin1" names. > - > -Example: > - > - pwm_ab: pwm@8550 { > - compatible = "amlogic,meson-gxbb-pwm"; > - reg = <0x0 0x08550 0x0 0x10>; > - #pwm-cells = <3>; > - clocks = <&xtal>, <&xtal>; > - clock-names = "clkin0", "clkin1"; > - } > -- > 2.39.1 > >
