* [PATCH v2 0/2] armada-370 irqchip DT changes
@ 2024-06-24 14:53 Marek Behún
2024-06-24 14:53 ` [PATCH v2 1/2] ARM: dts: armada-{370-xp,375,38x,39x}: Drop #size-cells from mpic node Marek Behún
2024-06-24 14:53 ` [PATCH v2 2/2] dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML Marek Behún
0 siblings, 2 replies; 6+ messages in thread
From: Marek Behún @ 2024-06-24 14:53 UTC (permalink / raw)
To: Andrew Lunn, Gregory Clement, Sebastian Hesselbarth, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, linux-arm-kernel, devicetree,
soc, Thomas Gleixner
Cc: Marek Behún
Hi Gregory, Thomas et al.
this small series coverts the marvell,mpic irqchip binding to YAML.
The conversion patch is preceded by a fix of 4 device-trees, removing
the #size-cells property from the marvell,mpic node.
v1 at:
https://patchwork.kernel.org/project/linux-soc/list/?seriestreba%20za=864184
Changes since v1:
- #interrupt-cells property is also required
Marek Behún (2):
ARM: dts: armada-{370-xp,375,38x,39x}: Drop #size-cells from mpic node
dt-bindings: interrupt-controller: convert marvell,mpic binding to
YAML
.../marvell,armada-370-xp-mpic.txt | 38 -----------
.../interrupt-controller/marvell,mpic.yaml | 63 +++++++++++++++++++
MAINTAINERS | 1 +
arch/arm/boot/dts/marvell/armada-370-xp.dtsi | 1 -
arch/arm/boot/dts/marvell/armada-375.dtsi | 1 -
arch/arm/boot/dts/marvell/armada-38x.dtsi | 1 -
arch/arm/boot/dts/marvell/armada-39x.dtsi | 1 -
7 files changed, 64 insertions(+), 42 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,armada-370-xp-mpic.txt
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml
--
2.44.2
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2 1/2] ARM: dts: armada-{370-xp,375,38x,39x}: Drop #size-cells from mpic node 2024-06-24 14:53 [PATCH v2 0/2] armada-370 irqchip DT changes Marek Behún @ 2024-06-24 14:53 ` Marek Behún 2024-07-05 12:41 ` Gregory CLEMENT 2024-06-24 14:53 ` [PATCH v2 2/2] dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML Marek Behún 1 sibling, 1 reply; 6+ messages in thread From: Marek Behún @ 2024-06-24 14:53 UTC (permalink / raw) To: Andrew Lunn, Gregory Clement, Sebastian Hesselbarth, Rob Herring, Krzysztof Kozlowski, Conor Dooley, linux-arm-kernel, devicetree, soc, Thomas Gleixner Cc: Marek Behún The marvell,mpic interrupt controller has no children nodes. Drop the Signed-off-by: Marek Behún <kabel@kernel.org> --- arch/arm/boot/dts/marvell/armada-370-xp.dtsi | 1 - arch/arm/boot/dts/marvell/armada-375.dtsi | 1 - arch/arm/boot/dts/marvell/armada-38x.dtsi | 1 - arch/arm/boot/dts/marvell/armada-39x.dtsi | 1 - 4 files changed, 4 deletions(-) diff --git a/arch/arm/boot/dts/marvell/armada-370-xp.dtsi b/arch/arm/boot/dts/marvell/armada-370-xp.dtsi index 0b8c2a64b36f..954c891e5aee 100644 --- a/arch/arm/boot/dts/marvell/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/marvell/armada-370-xp.dtsi @@ -168,7 +168,6 @@ mbusc: mbus-controller@20000 { mpic: interrupt-controller@20a00 { compatible = "marvell,mpic"; #interrupt-cells = <1>; - #size-cells = <1>; interrupt-controller; msi-controller; }; diff --git a/arch/arm/boot/dts/marvell/armada-375.dtsi b/arch/arm/boot/dts/marvell/armada-375.dtsi index ddc49547d786..99778b4b7e7b 100644 --- a/arch/arm/boot/dts/marvell/armada-375.dtsi +++ b/arch/arm/boot/dts/marvell/armada-375.dtsi @@ -376,7 +376,6 @@ mpic: interrupt-controller@20a00 { compatible = "marvell,mpic"; reg = <0x20a00 0x2d0>, <0x21070 0x58>; #interrupt-cells = <1>; - #size-cells = <1>; interrupt-controller; msi-controller; interrupts = <GIC_PPI 15 IRQ_TYPE_LEVEL_HIGH>; diff --git a/arch/arm/boot/dts/marvell/armada-38x.dtsi b/arch/arm/boot/dts/marvell/armada-38x.dtsi index 446861b6b17b..1181b13deabc 100644 --- a/arch/arm/boot/dts/marvell/armada-38x.dtsi +++ b/arch/arm/boot/dts/marvell/armada-38x.dtsi @@ -408,7 +408,6 @@ mpic: interrupt-controller@20a00 { compatible = "marvell,mpic"; reg = <0x20a00 0x2d0>, <0x21070 0x58>; #interrupt-cells = <1>; - #size-cells = <1>; interrupt-controller; msi-controller; interrupts = <GIC_PPI 15 IRQ_TYPE_LEVEL_HIGH>; diff --git a/arch/arm/boot/dts/marvell/armada-39x.dtsi b/arch/arm/boot/dts/marvell/armada-39x.dtsi index 9d1cac49c022..6d05835efb42 100644 --- a/arch/arm/boot/dts/marvell/armada-39x.dtsi +++ b/arch/arm/boot/dts/marvell/armada-39x.dtsi @@ -268,7 +268,6 @@ mpic: interrupt-controller@20a00 { compatible = "marvell,mpic"; reg = <0x20a00 0x2d0>, <0x21070 0x58>; #interrupt-cells = <1>; - #size-cells = <1>; interrupt-controller; msi-controller; interrupts = <GIC_PPI 15 IRQ_TYPE_LEVEL_HIGH>; -- 2.44.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: armada-{370-xp,375,38x,39x}: Drop #size-cells from mpic node 2024-06-24 14:53 ` [PATCH v2 1/2] ARM: dts: armada-{370-xp,375,38x,39x}: Drop #size-cells from mpic node Marek Behún @ 2024-07-05 12:41 ` Gregory CLEMENT 0 siblings, 0 replies; 6+ messages in thread From: Gregory CLEMENT @ 2024-07-05 12:41 UTC (permalink / raw) To: Marek Behún, Andrew Lunn, Sebastian Hesselbarth, Rob Herring, Krzysztof Kozlowski, Conor Dooley, linux-arm-kernel, devicetree, soc, Thomas Gleixner Cc: Marek Behún Marek Behún <kabel@kernel.org> writes: > The marvell,mpic interrupt controller has no children nodes. Drop the > > Signed-off-by: Marek Behún <kabel@kernel.org> Applied on mvebu/dt Thanks, Gregory > --- > arch/arm/boot/dts/marvell/armada-370-xp.dtsi | 1 - > arch/arm/boot/dts/marvell/armada-375.dtsi | 1 - > arch/arm/boot/dts/marvell/armada-38x.dtsi | 1 - > arch/arm/boot/dts/marvell/armada-39x.dtsi | 1 - > 4 files changed, 4 deletions(-) > > diff --git a/arch/arm/boot/dts/marvell/armada-370-xp.dtsi b/arch/arm/boot/dts/marvell/armada-370-xp.dtsi > index 0b8c2a64b36f..954c891e5aee 100644 > --- a/arch/arm/boot/dts/marvell/armada-370-xp.dtsi > +++ b/arch/arm/boot/dts/marvell/armada-370-xp.dtsi > @@ -168,7 +168,6 @@ mbusc: mbus-controller@20000 { > mpic: interrupt-controller@20a00 { > compatible = "marvell,mpic"; > #interrupt-cells = <1>; > - #size-cells = <1>; > interrupt-controller; > msi-controller; > }; > diff --git a/arch/arm/boot/dts/marvell/armada-375.dtsi b/arch/arm/boot/dts/marvell/armada-375.dtsi > index ddc49547d786..99778b4b7e7b 100644 > --- a/arch/arm/boot/dts/marvell/armada-375.dtsi > +++ b/arch/arm/boot/dts/marvell/armada-375.dtsi > @@ -376,7 +376,6 @@ mpic: interrupt-controller@20a00 { > compatible = "marvell,mpic"; > reg = <0x20a00 0x2d0>, <0x21070 0x58>; > #interrupt-cells = <1>; > - #size-cells = <1>; > interrupt-controller; > msi-controller; > interrupts = <GIC_PPI 15 IRQ_TYPE_LEVEL_HIGH>; > diff --git a/arch/arm/boot/dts/marvell/armada-38x.dtsi b/arch/arm/boot/dts/marvell/armada-38x.dtsi > index 446861b6b17b..1181b13deabc 100644 > --- a/arch/arm/boot/dts/marvell/armada-38x.dtsi > +++ b/arch/arm/boot/dts/marvell/armada-38x.dtsi > @@ -408,7 +408,6 @@ mpic: interrupt-controller@20a00 { > compatible = "marvell,mpic"; > reg = <0x20a00 0x2d0>, <0x21070 0x58>; > #interrupt-cells = <1>; > - #size-cells = <1>; > interrupt-controller; > msi-controller; > interrupts = <GIC_PPI 15 IRQ_TYPE_LEVEL_HIGH>; > diff --git a/arch/arm/boot/dts/marvell/armada-39x.dtsi b/arch/arm/boot/dts/marvell/armada-39x.dtsi > index 9d1cac49c022..6d05835efb42 100644 > --- a/arch/arm/boot/dts/marvell/armada-39x.dtsi > +++ b/arch/arm/boot/dts/marvell/armada-39x.dtsi > @@ -268,7 +268,6 @@ mpic: interrupt-controller@20a00 { > compatible = "marvell,mpic"; > reg = <0x20a00 0x2d0>, <0x21070 0x58>; > #interrupt-cells = <1>; > - #size-cells = <1>; > interrupt-controller; > msi-controller; > interrupts = <GIC_PPI 15 IRQ_TYPE_LEVEL_HIGH>; > -- > 2.44.2 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML 2024-06-24 14:53 [PATCH v2 0/2] armada-370 irqchip DT changes Marek Behún 2024-06-24 14:53 ` [PATCH v2 1/2] ARM: dts: armada-{370-xp,375,38x,39x}: Drop #size-cells from mpic node Marek Behún @ 2024-06-24 14:53 ` Marek Behún 2024-06-24 16:42 ` Conor Dooley 2024-06-24 20:44 ` Rob Herring (Arm) 1 sibling, 2 replies; 6+ messages in thread From: Marek Behún @ 2024-06-24 14:53 UTC (permalink / raw) To: Andrew Lunn, Gregory Clement, Sebastian Hesselbarth, Rob Herring, Krzysztof Kozlowski, Conor Dooley, linux-arm-kernel, devicetree, soc, Thomas Gleixner Cc: Marek Behún Convert the marvell,mpic device-tree binding to YAML. Add myself as maintainer. Signed-off-by: Marek Behún <kabel@kernel.org> --- .../marvell,armada-370-xp-mpic.txt | 38 ----------- .../interrupt-controller/marvell,mpic.yaml | 63 +++++++++++++++++++ MAINTAINERS | 1 + 3 files changed, 64 insertions(+), 38 deletions(-) delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,armada-370-xp-mpic.txt create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml diff --git a/Documentation/devicetree/bindings/interrupt-controller/marvell,armada-370-xp-mpic.txt b/Documentation/devicetree/bindings/interrupt-controller/marvell,armada-370-xp-mpic.txt deleted file mode 100644 index 5fc03134a999..000000000000 --- a/Documentation/devicetree/bindings/interrupt-controller/marvell,armada-370-xp-mpic.txt +++ /dev/null @@ -1,38 +0,0 @@ -Marvell Armada 370, 375, 38x, XP Interrupt Controller ------------------------------------------------------ - -Required properties: -- compatible: Should be "marvell,mpic" -- interrupt-controller: Identifies the node as an interrupt controller. -- msi-controller: Identifies the node as an PCI Message Signaled - Interrupt controller. -- #interrupt-cells: The number of cells to define the interrupts. Should be 1. - The cell is the IRQ number - -- reg: Should contain PMIC registers location and length. First pair - for the main interrupt registers, second pair for the per-CPU - interrupt registers. For this last pair, to be compliant with SMP - support, the "virtual" must be use (For the record, these registers - automatically map to the interrupt controller registers of the - current CPU) - -Optional properties: - -- interrupts: If defined, then it indicates that this MPIC is - connected as a slave to another interrupt controller. This is - typically the case on Armada 375 and Armada 38x, where the MPIC is - connected as a slave to the Cortex-A9 GIC. The provided interrupt - indicate to which GIC interrupt the MPIC output is connected. - -Example: - - mpic: interrupt-controller@d0020000 { - compatible = "marvell,mpic"; - #interrupt-cells = <1>; - #address-cells = <1>; - #size-cells = <1>; - interrupt-controller; - msi-controller; - reg = <0xd0020a00 0x1d0>, - <0xd0021070 0x58>; - }; diff --git a/Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml b/Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml new file mode 100644 index 000000000000..616a41c87352 --- /dev/null +++ b/Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml @@ -0,0 +1,63 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/interrupt-controller/marvell,mpic.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Marvell Armada 370, 375, 38x, 39x, XP Interrupt Controller + +maintainers: + - Marek Behún <kabel@kernel.org> + +description: | + The top-level interrupt controller on Marvell Armada 370 and XP. On these + platforms it also provides inter-processor interrupts. + + On Marvell Armada 375, 38x and 39x this controller is wired under ARM GIC. + + Provides MSI handling for the PCIe controllers. + +properties: + compatible: + const: marvell,mpic + + reg: + items: + - description: main registers + - description: per-cpu registers + + interrupts: + items: + - description: | + Parent interrupt on platforms where MPIC is not the top-level + interrupt controller. + + interrupt-controller: true + + '#interrupt-cells': + const: 1 + + msi-controller: true + +required: + - compatible + - reg + - interrupt-controller + - '#interrupt-cells' + - msi-controller + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/interrupt-controller/irq.h> + + interrupt-controller@20a00 { + compatible = "marvell,mpic"; + reg = <0x20a00 0x2d0>, <0x21070 0x58>; + interrupts = <GIC_PPI 15 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + #interrupt-cells = <1>; + msi-controller; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 2ca8f35dfe03..17f1ea1eacf3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2211,6 +2211,7 @@ F: Documentation/ABI/testing/sysfs-firmware-turris-mox-rwtm F: Documentation/devicetree/bindings/bus/moxtet.txt F: Documentation/devicetree/bindings/firmware/cznic,turris-mox-rwtm.txt F: Documentation/devicetree/bindings/gpio/gpio-moxtet.txt +F: Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml F: Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml F: Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt F: drivers/bus/moxtet.c -- 2.44.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML 2024-06-24 14:53 ` [PATCH v2 2/2] dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML Marek Behún @ 2024-06-24 16:42 ` Conor Dooley 2024-06-24 20:44 ` Rob Herring (Arm) 1 sibling, 0 replies; 6+ messages in thread From: Conor Dooley @ 2024-06-24 16:42 UTC (permalink / raw) To: Marek Behún Cc: Andrew Lunn, Gregory Clement, Sebastian Hesselbarth, Rob Herring, Krzysztof Kozlowski, Conor Dooley, linux-arm-kernel, devicetree, soc, Thomas Gleixner [-- Attachment #1: Type: text/plain, Size: 1173 bytes --] On Mon, Jun 24, 2024 at 04:53:55PM +0200, Marek Behún wrote: > diff --git a/Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml b/Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml > new file mode 100644 > index 000000000000..616a41c87352 > --- /dev/null > +++ b/Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml > @@ -0,0 +1,63 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/interrupt-controller/marvell,mpic.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Marvell Armada 370, 375, 38x, 39x, XP Interrupt Controller > + > +maintainers: > + - Marek Behún <kabel@kernel.org> > + > +description: | If you end up respinning, both |s from descriptions can be dropped, but those are relatively minor and the conversion looks okay to me. Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Thanks, Conor. > + interrupts: > + items: > + - description: | > + Parent interrupt on platforms where MPIC is not the top-level > + interrupt controller. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 228 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML 2024-06-24 14:53 ` [PATCH v2 2/2] dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML Marek Behún 2024-06-24 16:42 ` Conor Dooley @ 2024-06-24 20:44 ` Rob Herring (Arm) 1 sibling, 0 replies; 6+ messages in thread From: Rob Herring (Arm) @ 2024-06-24 20:44 UTC (permalink / raw) To: Marek Behún Cc: devicetree, soc, Thomas Gleixner, Gregory Clement, Conor Dooley, Andrew Lunn, linux-arm-kernel, Rob Herring, Krzysztof Kozlowski, Sebastian Hesselbarth On Mon, 24 Jun 2024 16:53:55 +0200, Marek Behún wrote: > Convert the marvell,mpic device-tree binding to YAML. Add myself as > maintainer. > > Signed-off-by: Marek Behún <kabel@kernel.org> > --- > .../marvell,armada-370-xp-mpic.txt | 38 ----------- > .../interrupt-controller/marvell,mpic.yaml | 63 +++++++++++++++++++ > MAINTAINERS | 1 + > 3 files changed, 64 insertions(+), 38 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,armada-370-xp-mpic.txt > create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml > Applied, thanks! ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-07-05 12:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-24 14:53 [PATCH v2 0/2] armada-370 irqchip DT changes Marek Behún
2024-06-24 14:53 ` [PATCH v2 1/2] ARM: dts: armada-{370-xp,375,38x,39x}: Drop #size-cells from mpic node Marek Behún
2024-07-05 12:41 ` Gregory CLEMENT
2024-06-24 14:53 ` [PATCH v2 2/2] dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML Marek Behún
2024-06-24 16:42 ` Conor Dooley
2024-06-24 20:44 ` Rob Herring (Arm)
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).