| Message ID | 20190723132658.5068-2-maxime.ripard@bootlin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] dt-bindings: irq: Convert Allwinner IRQ Controller to a schema | expand |
On Tue, Jul 23, 2019 at 7:27 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > The Allwinner SoCs have an interrupt controller called NMI supported in > Linux, with a matching Device Tree binding. > > Now that we have the DT validation in place, let's convert the device tree > bindings for that controller over to a YAML schemas. > > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> > --- > .../allwinner,sun7i-a20-sc-nmi.yaml | 83 +++++++++++++++++++ > .../allwinner,sunxi-nmi.txt | 29 ------- > 2 files changed, 83 insertions(+), 29 deletions(-) > create mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml > delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-nmi.txt > > diff --git a/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml > new file mode 100644 > index 000000000000..cb8077b0c8dd > --- /dev/null > +++ b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml > @@ -0,0 +1,83 @@ > +# SPDX-License-Identifier: GPL-2.0 > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Allwinner A20 Non-Maskable Interrupt Controller Device Tree Bindings > + > +maintainers: > + - Chen-Yu Tsai <wens@csie.org> > + - Maxime Ripard <maxime.ripard@bootlin.com> > + > +allOf: > + - $ref: /schemas/interrupt-controller.yaml# > + > +select: > + properties: > + compatible: > + contains: > + enum: > + - allwinner,sun6i-a31-r-intc > + - allwinner,sun7i-a20-sc-nmi > + - allwinner,sun9i-a80-sc-nmi This should have all the possible compatibles in case all are not listed. > + > + # Deprecated > + - allwinner,sun6i-a31-sc-nmi I know we already did things this way before, but perhaps this should be listed below with the 'deprecated' property. The tools can include it in select, but then remove it from compatible property. > + > + required: > + - compatible > + > +properties: > + "#interrupt-cells": > + const: 2 > + description: > + The first cell is the IRQ number, the second cell the trigger > + type as defined in interrupt.txt in this directory. > + > + compatible: > + oneOf: > + - const: allwinner,sun6i-a31-r-intc > + - const: allwinner,sun7i-a20-sc-nmi > + - items: > + - const: allwinner,sun8i-a83t-r-intc > + - const: allwinner,sun6i-a31-r-intc > + - const: allwinner,sun9i-a80-sc-nmi > + - items: > + - const: allwinner,sun50i-a64-r-intc > + - const: allwinner,sun6i-a31-r-intc > + - items: > + - const: allwinner,sun50i-h6-r-intc > + - const: allwinner,sun6i-a31-r-intc > + > + reg: > + maxItems: 1 > + > + interrupts: > + maxItems: 1 > + > + interrupt-controller: true > + > +required: > + - "#interrupt-cells" > + - compatible > + - reg > + - interrupts > + - interrupt-controller > + > +# FIXME: We should set it, but it would report all the generic > +# properties as additional properties. > +# additionalProperties: false > + > +examples: > + - | > + interrupt-controller@1c00030 { > + compatible = "allwinner,sun7i-a20-sc-nmi"; > + interrupt-controller; > + #interrupt-cells = <2>; > + reg = <0x01c00030 0x0c>; > + interrupt-parent = <&gic>; > + interrupts = <0 0 4>; > + }; > + > +...
Hi Rob, On Tue, Jul 23, 2019 at 10:32:41AM -0600, Rob Herring wrote: > On Tue, Jul 23, 2019 at 7:27 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > > > The Allwinner SoCs have an interrupt controller called NMI supported in > > Linux, with a matching Device Tree binding. > > > > Now that we have the DT validation in place, let's convert the device tree > > bindings for that controller over to a YAML schemas. > > > > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> > > --- > > .../allwinner,sun7i-a20-sc-nmi.yaml | 83 +++++++++++++++++++ > > .../allwinner,sunxi-nmi.txt | 29 ------- > > 2 files changed, 83 insertions(+), 29 deletions(-) > > create mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml > > delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-nmi.txt > > > > diff --git a/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml > > new file mode 100644 > > index 000000000000..cb8077b0c8dd > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml > > @@ -0,0 +1,83 @@ > > +# SPDX-License-Identifier: GPL-2.0 > > +%YAML 1.2 > > +--- > > +$id: http://devicetree.org/schemas/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml# > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > + > > +title: Allwinner A20 Non-Maskable Interrupt Controller Device Tree Bindings > > + > > +maintainers: > > + - Chen-Yu Tsai <wens@csie.org> > > + - Maxime Ripard <maxime.ripard@bootlin.com> > > + > > +allOf: > > + - $ref: /schemas/interrupt-controller.yaml# > > + > > +select: > > + properties: > > + compatible: > > + contains: > > + enum: > > + - allwinner,sun6i-a31-r-intc > > + - allwinner,sun7i-a20-sc-nmi > > + - allwinner,sun9i-a80-sc-nmi > > This should have all the possible compatibles in case all are not > listed. I'm sorry, but I'm not sure I understood what you meant here :/ > > > + > > + # Deprecated > > + - allwinner,sun6i-a31-sc-nmi > > I know we already did things this way before, but perhaps this should > be listed below with the 'deprecated' property. The tools can include > it in select, but then remove it from compatible property. Can we have more than just one of the choice for an enum? In this particular case, since we have oneOf it's not really too much of an issue, but there's a significant amount of users of enum for the compatibles. Thanks! Maxime > > + > > + required: > > + - compatible > > + > > +properties: > > + "#interrupt-cells": > > + const: 2 > > + description: > > + The first cell is the IRQ number, the second cell the trigger > > + type as defined in interrupt.txt in this directory. > > + > > + compatible: > > + oneOf: > > + - const: allwinner,sun6i-a31-r-intc > > + - const: allwinner,sun7i-a20-sc-nmi > > + - items: > > + - const: allwinner,sun8i-a83t-r-intc > > + - const: allwinner,sun6i-a31-r-intc > > + - const: allwinner,sun9i-a80-sc-nmi > > + - items: > > + - const: allwinner,sun50i-a64-r-intc > > + - const: allwinner,sun6i-a31-r-intc > > + - items: > > + - const: allwinner,sun50i-h6-r-intc > > + - const: allwinner,sun6i-a31-r-intc > > + > > + reg: > > + maxItems: 1 > > + > > + interrupts: > > + maxItems: 1 > > + > > + interrupt-controller: true > > + > > +required: > > + - "#interrupt-cells" > > + - compatible > > + - reg > > + - interrupts > > + - interrupt-controller > > + > > +# FIXME: We should set it, but it would report all the generic > > +# properties as additional properties. > > +# additionalProperties: false > > + > > +examples: > > + - | > > + interrupt-controller@1c00030 { > > + compatible = "allwinner,sun7i-a20-sc-nmi"; > > + interrupt-controller; > > + #interrupt-cells = <2>; > > + reg = <0x01c00030 0x0c>; > > + interrupt-parent = <&gic>; > > + interrupts = <0 0 4>; > > + }; > > + > > +... -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
On Mon, Aug 12, 2019 at 11:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > Hi Rob, > > On Tue, Jul 23, 2019 at 10:32:41AM -0600, Rob Herring wrote: > > On Tue, Jul 23, 2019 at 7:27 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > > > > > The Allwinner SoCs have an interrupt controller called NMI supported in > > > Linux, with a matching Device Tree binding. > > > > > > Now that we have the DT validation in place, let's convert the device tree > > > bindings for that controller over to a YAML schemas. > > > > > > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> > > > --- > > > .../allwinner,sun7i-a20-sc-nmi.yaml | 83 +++++++++++++++++++ > > > .../allwinner,sunxi-nmi.txt | 29 ------- > > > 2 files changed, 83 insertions(+), 29 deletions(-) > > > create mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml > > > delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-nmi.txt > > > > > > diff --git a/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml > > > new file mode 100644 > > > index 000000000000..cb8077b0c8dd > > > --- /dev/null > > > +++ b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml > > > @@ -0,0 +1,83 @@ > > > +# SPDX-License-Identifier: GPL-2.0 > > > +%YAML 1.2 > > > +--- > > > +$id: http://devicetree.org/schemas/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml# > > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > > + > > > +title: Allwinner A20 Non-Maskable Interrupt Controller Device Tree Bindings > > > + > > > +maintainers: > > > + - Chen-Yu Tsai <wens@csie.org> > > > + - Maxime Ripard <maxime.ripard@bootlin.com> > > > + > > > +allOf: > > > + - $ref: /schemas/interrupt-controller.yaml# > > > + > > > +select: > > > + properties: > > > + compatible: > > > + contains: > > > + enum: > > > + - allwinner,sun6i-a31-r-intc > > > + - allwinner,sun7i-a20-sc-nmi > > > + - allwinner,sun9i-a80-sc-nmi > > > > This should have all the possible compatibles in case all are not > > listed. > > I'm sorry, but I'm not sure I understood what you meant here :/ You are missing these from the list: allwinner,sun8i-a83t-r-intc allwinner,sun50i-a64-r-intc allwinner,sun50i-h6-r-intc We need them all to catch any DTs with only the above strings. > > > > > > + > > > + # Deprecated > > > + - allwinner,sun6i-a31-sc-nmi > > > > I know we already did things this way before, but perhaps this should > > be listed below with the 'deprecated' property. The tools can include > > it in select, but then remove it from compatible property. > > Can we have more than just one of the choice for an enum? > > In this particular case, since we have oneOf it's not really too much > of an issue, but there's a significant amount of users of enum for the > compatibles. I think we have to use oneOf here. There's not that many cases of deprecated compatibles. Rob
diff --git a/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml new file mode 100644 index 000000000000..cb8077b0c8dd --- /dev/null +++ b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml @@ -0,0 +1,83 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Allwinner A20 Non-Maskable Interrupt Controller Device Tree Bindings + +maintainers: + - Chen-Yu Tsai <wens@csie.org> + - Maxime Ripard <maxime.ripard@bootlin.com> + +allOf: + - $ref: /schemas/interrupt-controller.yaml# + +select: + properties: + compatible: + contains: + enum: + - allwinner,sun6i-a31-r-intc + - allwinner,sun7i-a20-sc-nmi + - allwinner,sun9i-a80-sc-nmi + + # Deprecated + - allwinner,sun6i-a31-sc-nmi + + required: + - compatible + +properties: + "#interrupt-cells": + const: 2 + description: + The first cell is the IRQ number, the second cell the trigger + type as defined in interrupt.txt in this directory. + + compatible: + oneOf: + - const: allwinner,sun6i-a31-r-intc + - const: allwinner,sun7i-a20-sc-nmi + - items: + - const: allwinner,sun8i-a83t-r-intc + - const: allwinner,sun6i-a31-r-intc + - const: allwinner,sun9i-a80-sc-nmi + - items: + - const: allwinner,sun50i-a64-r-intc + - const: allwinner,sun6i-a31-r-intc + - items: + - const: allwinner,sun50i-h6-r-intc + - const: allwinner,sun6i-a31-r-intc + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + interrupt-controller: true + +required: + - "#interrupt-cells" + - compatible + - reg + - interrupts + - interrupt-controller + +# FIXME: We should set it, but it would report all the generic +# properties as additional properties. +# additionalProperties: false + +examples: + - | + interrupt-controller@1c00030 { + compatible = "allwinner,sun7i-a20-sc-nmi"; + interrupt-controller; + #interrupt-cells = <2>; + reg = <0x01c00030 0x0c>; + interrupt-parent = <&gic>; + interrupts = <0 0 4>; + }; + +... diff --git a/Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-nmi.txt b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-nmi.txt deleted file mode 100644 index 24beadf7ba83..000000000000 --- a/Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-nmi.txt +++ /dev/null @@ -1,29 +0,0 @@ -Allwinner Sunxi NMI Controller -============================== - -Required properties: - -- compatible : should be one of the following: - - "allwinner,sun7i-a20-sc-nmi" - - "allwinner,sun6i-a31-sc-nmi" (deprecated) - - "allwinner,sun6i-a31-r-intc" - - "allwinner,sun9i-a80-nmi" -- reg : Specifies base physical address and size of the registers. -- interrupt-controller : Identifies the node as an interrupt controller -- #interrupt-cells : Specifies the number of cells needed to encode an - interrupt source. The value shall be 2. The first cell is the IRQ number, the - second cell the trigger type as defined in interrupt.txt in this directory. -- interrupts: Specifies the interrupt line (NMI) which is handled by - the interrupt controller in the parent controller's notation. This value - shall be the NMI. - -Example: - -sc-nmi-intc@1c00030 { - compatible = "allwinner,sun7i-a20-sc-nmi"; - interrupt-controller; - #interrupt-cells = <2>; - reg = <0x01c00030 0x0c>; - interrupt-parent = <&gic>; - interrupts = <0 0 4>; -};
The Allwinner SoCs have an interrupt controller called NMI supported in Linux, with a matching Device Tree binding. Now that we have the DT validation in place, let's convert the device tree bindings for that controller over to a YAML schemas. Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> --- .../allwinner,sun7i-a20-sc-nmi.yaml | 83 +++++++++++++++++++ .../allwinner,sunxi-nmi.txt | 29 ------- 2 files changed, 83 insertions(+), 29 deletions(-) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-nmi.txt