Skip to contentSkip to conversation

ARM: dts: armada-{370-xp,375,38x,39x}: Drop #size-cells from mpic node

PATCH Superseded Marek Behún 1 participant 3 messages Jun 21, 2024

Subsystems (4)
Device tree bindings irqchip drivers Arm/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SoC support Arm/cz.nic turris support

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Marek Behún

author maintainer
#0 lore raw

PATCH 1/2 ARM: dts: armada-{370-xp,375,38x,39x}: Drop #size-cells from mpic node

The marvell,mpic interrupt controller has no children nodes. Drop the

Signed-off-by Marek Behún <[email protected]>
---
 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(-)
arch/arm/boot/dts/marvell/armada-370-xp.dtsi +0 -1
index 0b8c2a64b36f..954c891e5aee 100644
@@ -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;
 			};
arch/arm/boot/dts/marvell/armada-375.dtsi +0 -1
index ddc49547d786..99778b4b7e7b 100644
@@ -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>;
arch/arm/boot/dts/marvell/armada-38x.dtsi +0 -1
index 01d2288bbdae..1c84cc317560 100644
@@ -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>;
arch/arm/boot/dts/marvell/armada-39x.dtsi +0 -1
index 9d1cac49c022..6d05835efb42 100644
@@ -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>;
Signature · 1 line
2.44.2
author maintainer
#1 lore raw

PATCH 2/2 dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML

Convert the marvell,mpic device-tree binding to YAML. Add myself as maintainer.

Signed-off-by Marek Behún <[email protected]>
---
 .../marvell,armada-370-xp-mpic.txt            | 38 ------------
 .../interrupt-controller/marvell,mpic.yaml    | 62 +++++++++++++++++++
 MAINTAINERS                                   |  1 +
 3 files changed, 63 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
Documentation/devicetree/bindings/interrupt-controller/marvell,armada-370-xp-mpic.txt deleted +0 -38
deleted file mode 100644
index 5fc03134a999..000000000000
@@ -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>;
-        };
Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml new file +62 -0

62 lines not on this page · raw message

MAINTAINERS +1 -0
index b68c8b25bb93..5506e3141d92 100644
@@ -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
Signature · 1 line
2.44.2
author maintainer
#2 lore raw

Re: [PATCH 2/2] dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML

Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml line 46

Quoted 5 lines · On Fri, 21 Jun 2024 10:23:13 +0200 Marek Behún <[email protected]> wrote:
Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml new file +5 -0
+required:
+  - compatible
+  - reg
+  - interrupt-controller
+  - msi-controller

Hm, #interrupt-cells is also required. Will add in v2.