| Message ID | 20250505144613.1287360-1-robh@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | dt-bindings: interrupt-controller: Convert aspeed,ast2xxx-scu-ic to DT schema | expand |
Hi Rob, Thanks for the conversion. One comment below: On Mon, 2025-05-05 at 09:46 -0500, Rob Herring (Arm) wrote: > Convert the Aspeed SCU interrupt controller binding to schema format. > It's a straight-forward conversion of the typical interrupt > controller. > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> > --- > .../aspeed,ast2500-scu-ic.yaml | 48 > +++++++++++++++++++ > .../aspeed,ast2xxx-scu-ic.txt | 23 --------- > .../bindings/mfd/aspeed,ast2x00-scu.yaml | 9 +++- > MAINTAINERS | 2 +- > 4 files changed, 57 insertions(+), 25 deletions(-) > create mode 100644 Documentation/devicetree/bindings/interrupt- > controller/aspeed,ast2500-scu-ic.yaml > delete mode 100644 Documentation/devicetree/bindings/interrupt- > controller/aspeed,ast2xxx-scu-ic.txt > > diff --git a/Documentation/devicetree/bindings/interrupt- > controller/aspeed,ast2500-scu-ic.yaml > b/Documentation/devicetree/bindings/interrupt- > controller/aspeed,ast2500-scu-ic.yaml > new file mode 100644 > index 000000000000..d5287a2bf866 > --- /dev/null > +++ b/Documentation/devicetree/bindings/interrupt- > controller/aspeed,ast2500-scu-ic.yaml > @@ -0,0 +1,48 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +# Copyright 2025 Eddie James > +%YAML 1.2 > +--- > +$id: > http://devicetree.org/schemas/interrupt-controller/aspeed,ast2500-scu-ic.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Aspeed AST25XX and AST26XX SCU Interrupt Controller > + > +maintainers: > + - Eddie James <eajames@linux.ibm.com> > + > +properties: > + compatible: > + enum: > + - aspeed,ast2500-scu-ic > + - aspeed,ast2600-scu-ic0 > + - aspeed,ast2600-scu-ic1 > + > + reg: > + maxItems: 1 > + > + '#interrupt-cells': > + const: 1 > + > + interrupts: > + maxItems: 1 > + > + interrupt-controller: true > + > +required: > + - compatible > + - reg > + - '#interrupt-cells' > + - interrupts > + - interrupt-controller > + > +additionalProperties: false > + > +examples: > + - | > + interrupt-controller@18 { > + compatible = "aspeed,ast2500-scu-ic"; > + reg = <0x18 0x4>; > + #interrupt-cells = <1>; > + interrupts = <21>; > + interrupt-controller; > + }; > diff --git a/Documentation/devicetree/bindings/interrupt- > controller/aspeed,ast2xxx-scu-ic.txt > b/Documentation/devicetree/bindings/interrupt- > controller/aspeed,ast2xxx-scu-ic.txt > deleted file mode 100644 > index 251ed44171db..000000000000 > --- a/Documentation/devicetree/bindings/interrupt- > controller/aspeed,ast2xxx-scu-ic.txt > +++ /dev/null > @@ -1,23 +0,0 @@ > -Aspeed AST25XX and AST26XX SCU Interrupt Controller > - > -Required Properties: > - - #interrupt-cells : must be 1 > - - compatible : must be "aspeed,ast2500-scu-ic", > - "aspeed,ast2600-scu-ic0" or > - "aspeed,ast2600-scu-ic1" > - - interrupts : interrupt from the parent > controller > - - interrupt-controller : indicates that the > controller receives and > - fires new interrupts for child > busses > - > -Example: > - > - syscon@1e6e2000 { > - ranges = <0 0x1e6e2000 0x1a8>; > - > - scu_ic: interrupt-controller@18 { > - #interrupt-cells = <1>; > - compatible = "aspeed,ast2500-scu-ic"; > - interrupts = <21>; > - interrupt-controller; > - }; > - }; > diff --git a/Documentation/devicetree/bindings/mfd/aspeed,ast2x00- > scu.yaml b/Documentation/devicetree/bindings/mfd/aspeed,ast2x00- > scu.yaml > index c800d5e53b65..12986ebe7ec7 100644 > --- a/Documentation/devicetree/bindings/mfd/aspeed,ast2x00-scu.yaml > +++ b/Documentation/devicetree/bindings/mfd/aspeed,ast2x00-scu.yaml > @@ -48,8 +48,15 @@ properties: > > patternProperties: > '^p2a-control@[0-9a-f]+$': > - description: See Documentation/devicetree/bindings/misc/aspeed- > p2a-ctrl.txt > type: object > + additionalProperties: true > + properties: > + compatible: > + contains: > + enum: > + - aspeed,ast2500-scu-ic > + - aspeed,ast2600-scu-ic0 > + - aspeed,ast2600-scu-ic1 This change should be done on the interrupt-controller pattern property node rather than the p2a-controller node. Andrew
On Tue, May 6, 2025 at 10:26 PM Andrew Jeffery <andrew@codeconstruct.com.au> wrote: > > Hi Rob, > > Thanks for the conversion. One comment below: > > On Mon, 2025-05-05 at 09:46 -0500, Rob Herring (Arm) wrote: > > Convert the Aspeed SCU interrupt controller binding to schema format. > > It's a straight-forward conversion of the typical interrupt > > controller. > > > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> > > --- > > .../aspeed,ast2500-scu-ic.yaml | 48 > > +++++++++++++++++++ > > .../aspeed,ast2xxx-scu-ic.txt | 23 --------- > > .../bindings/mfd/aspeed,ast2x00-scu.yaml | 9 +++- > > MAINTAINERS | 2 +- > > 4 files changed, 57 insertions(+), 25 deletions(-) > > create mode 100644 Documentation/devicetree/bindings/interrupt- > > controller/aspeed,ast2500-scu-ic.yaml > > delete mode 100644 Documentation/devicetree/bindings/interrupt- > > controller/aspeed,ast2xxx-scu-ic.txt > > > > diff --git a/Documentation/devicetree/bindings/interrupt- > > controller/aspeed,ast2500-scu-ic.yaml > > b/Documentation/devicetree/bindings/interrupt- > > controller/aspeed,ast2500-scu-ic.yaml > > new file mode 100644 > > index 000000000000..d5287a2bf866 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/interrupt- > > controller/aspeed,ast2500-scu-ic.yaml > > @@ -0,0 +1,48 @@ > > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > > +# Copyright 2025 Eddie James > > +%YAML 1.2 > > +--- > > +$id: > > http://devicetree.org/schemas/interrupt-controller/aspeed,ast2500-scu-ic.yaml# > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > + > > +title: Aspeed AST25XX and AST26XX SCU Interrupt Controller > > + > > +maintainers: > > + - Eddie James <eajames@linux.ibm.com> > > + > > +properties: > > + compatible: > > + enum: > > + - aspeed,ast2500-scu-ic > > + - aspeed,ast2600-scu-ic0 > > + - aspeed,ast2600-scu-ic1 > > + > > + reg: > > + maxItems: 1 > > + > > + '#interrupt-cells': > > + const: 1 > > + > > + interrupts: > > + maxItems: 1 > > + > > + interrupt-controller: true > > + > > +required: > > + - compatible > > + - reg > > + - '#interrupt-cells' > > + - interrupts > > + - interrupt-controller > > + > > +additionalProperties: false > > + > > +examples: > > + - | > > + interrupt-controller@18 { > > + compatible = "aspeed,ast2500-scu-ic"; > > + reg = <0x18 0x4>; > > + #interrupt-cells = <1>; > > + interrupts = <21>; > > + interrupt-controller; > > + }; > > diff --git a/Documentation/devicetree/bindings/interrupt- > > controller/aspeed,ast2xxx-scu-ic.txt > > b/Documentation/devicetree/bindings/interrupt- > > controller/aspeed,ast2xxx-scu-ic.txt > > deleted file mode 100644 > > index 251ed44171db..000000000000 > > --- a/Documentation/devicetree/bindings/interrupt- > > controller/aspeed,ast2xxx-scu-ic.txt > > +++ /dev/null > > @@ -1,23 +0,0 @@ > > -Aspeed AST25XX and AST26XX SCU Interrupt Controller > > - > > -Required Properties: > > - - #interrupt-cells : must be 1 > > - - compatible : must be "aspeed,ast2500-scu-ic", > > - "aspeed,ast2600-scu-ic0" or > > - "aspeed,ast2600-scu-ic1" > > - - interrupts : interrupt from the parent > > controller > > - - interrupt-controller : indicates that the > > controller receives and > > - fires new interrupts for child > > busses > > - > > -Example: > > - > > - syscon@1e6e2000 { > > - ranges = <0 0x1e6e2000 0x1a8>; > > - > > - scu_ic: interrupt-controller@18 { > > - #interrupt-cells = <1>; > > - compatible = "aspeed,ast2500-scu-ic"; > > - interrupts = <21>; > > - interrupt-controller; > > - }; > > - }; > > diff --git a/Documentation/devicetree/bindings/mfd/aspeed,ast2x00- > > scu.yaml b/Documentation/devicetree/bindings/mfd/aspeed,ast2x00- > > scu.yaml > > index c800d5e53b65..12986ebe7ec7 100644 > > --- a/Documentation/devicetree/bindings/mfd/aspeed,ast2x00-scu.yaml > > +++ b/Documentation/devicetree/bindings/mfd/aspeed,ast2x00-scu.yaml > > @@ -48,8 +48,15 @@ properties: > > > > patternProperties: > > '^p2a-control@[0-9a-f]+$': > > - description: See Documentation/devicetree/bindings/misc/aspeed- > > p2a-ctrl.txt > > type: object > > + additionalProperties: true > > + properties: > > + compatible: > > + contains: > > + enum: > > + - aspeed,ast2500-scu-ic > > + - aspeed,ast2600-scu-ic0 > > + - aspeed,ast2600-scu-ic1 > > This change should be done on the interrupt-controller pattern property > node rather than the p2a-controller node. Indeed, I fixed it up when applying. Rob
diff --git a/Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2500-scu-ic.yaml b/Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2500-scu-ic.yaml new file mode 100644 index 000000000000..d5287a2bf866 --- /dev/null +++ b/Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2500-scu-ic.yaml @@ -0,0 +1,48 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright 2025 Eddie James +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/interrupt-controller/aspeed,ast2500-scu-ic.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Aspeed AST25XX and AST26XX SCU Interrupt Controller + +maintainers: + - Eddie James <eajames@linux.ibm.com> + +properties: + compatible: + enum: + - aspeed,ast2500-scu-ic + - aspeed,ast2600-scu-ic0 + - aspeed,ast2600-scu-ic1 + + reg: + maxItems: 1 + + '#interrupt-cells': + const: 1 + + interrupts: + maxItems: 1 + + interrupt-controller: true + +required: + - compatible + - reg + - '#interrupt-cells' + - interrupts + - interrupt-controller + +additionalProperties: false + +examples: + - | + interrupt-controller@18 { + compatible = "aspeed,ast2500-scu-ic"; + reg = <0x18 0x4>; + #interrupt-cells = <1>; + interrupts = <21>; + interrupt-controller; + }; diff --git a/Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt b/Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt deleted file mode 100644 index 251ed44171db..000000000000 --- a/Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt +++ /dev/null @@ -1,23 +0,0 @@ -Aspeed AST25XX and AST26XX SCU Interrupt Controller - -Required Properties: - - #interrupt-cells : must be 1 - - compatible : must be "aspeed,ast2500-scu-ic", - "aspeed,ast2600-scu-ic0" or - "aspeed,ast2600-scu-ic1" - - interrupts : interrupt from the parent controller - - interrupt-controller : indicates that the controller receives and - fires new interrupts for child busses - -Example: - - syscon@1e6e2000 { - ranges = <0 0x1e6e2000 0x1a8>; - - scu_ic: interrupt-controller@18 { - #interrupt-cells = <1>; - compatible = "aspeed,ast2500-scu-ic"; - interrupts = <21>; - interrupt-controller; - }; - }; diff --git a/Documentation/devicetree/bindings/mfd/aspeed,ast2x00-scu.yaml b/Documentation/devicetree/bindings/mfd/aspeed,ast2x00-scu.yaml index c800d5e53b65..12986ebe7ec7 100644 --- a/Documentation/devicetree/bindings/mfd/aspeed,ast2x00-scu.yaml +++ b/Documentation/devicetree/bindings/mfd/aspeed,ast2x00-scu.yaml @@ -48,8 +48,15 @@ properties: patternProperties: '^p2a-control@[0-9a-f]+$': - description: See Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt type: object + additionalProperties: true + properties: + compatible: + contains: + enum: + - aspeed,ast2500-scu-ic + - aspeed,ast2600-scu-ic0 + - aspeed,ast2600-scu-ic1 '^pinctrl(@[0-9a-f]+)?$': type: object diff --git a/MAINTAINERS b/MAINTAINERS index 9e37f0c14496..a792c5495d15 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3577,7 +3577,7 @@ ASPEED SCU INTERRUPT CONTROLLER DRIVER M: Eddie James <eajames@linux.ibm.com> L: linux-aspeed@lists.ozlabs.org (moderated for non-subscribers) S: Maintained -F: Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt +F: Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2500-scu-ic.yaml F: drivers/irqchip/irq-aspeed-scu-ic.c F: include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
Convert the Aspeed SCU interrupt controller binding to schema format. It's a straight-forward conversion of the typical interrupt controller. Signed-off-by: Rob Herring (Arm) <robh@kernel.org> --- .../aspeed,ast2500-scu-ic.yaml | 48 +++++++++++++++++++ .../aspeed,ast2xxx-scu-ic.txt | 23 --------- .../bindings/mfd/aspeed,ast2x00-scu.yaml | 9 +++- MAINTAINERS | 2 +- 4 files changed, 57 insertions(+), 25 deletions(-) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2500-scu-ic.yaml delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt