armada-370 irqchip DT changes
Subsystems (4)
Marek Behún
maintainerv2 cover armada-370 irqchip DT changes
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
Signature · 1 line
2.44.2
Marek Behún
maintainerPATCH v2 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
--- 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
@@ -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
@@ -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
@@ -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
@@ -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
Gregory CLEMENT
maintainerRe: [PATCH v2 1/2] ARM: dts: armada-{370-xp,375,38x,39x}: Drop #size-cells from mpic node
Quoted 3 lines · Marek Behún
The marvell,mpic interrupt controller has no children nodes. Drop the
Signed-off-by Marek Behún <[email protected]>
Applied on mvebu/dt
Thanks,
Gregory
Quoted 57 lines
--- 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@@ -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@@ -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@@ -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@@ -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
Marek Behún
maintainerPATCH v2 2/2 dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML
In reply to Marek BehúnConvert the marvell,mpic device-tree binding to YAML. Add myself as maintainer.
--- .../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
Documentation/devicetree/bindings/interrupt-controller/marvell,armada-370-xp-mpic.txt deleted +0 -38
@@ -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 +63 -0
63 lines not on this page · raw message
MAINTAINERS +1 -0
@@ -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
Re: [PATCH v2 2/2] dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML
Quoted 8 lines · Marek Behún
Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml new file +2
-0@@ -0,0 +1,63 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2
Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml line 12
Quoted 10 lines
Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml new file +10
-0+--- +$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 <[email protected]> + +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.
Thanks,
Conor.
Quoted 5 lines
Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml new file +5
-0+ interrupts: + items: + - description: | + Parent interrupt on platforms where MPIC is not the top-level + interrupt controller.
Re: [PATCH v2 2/2] dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML
In reply to Marek BehúnQuoted 12 lines · Marek Behún
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 | 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!
This series was applied to soc/soc.git (for-next) by Arnd Bergmann <[email protected]>:
Hello:
This series was applied to soc/soc.git (for-next)
by Arnd Bergmann <[email protected]>:
Quoted 10 lines · On Mon, 24 Jun 2024 16:53:53 +0200 you wrote:
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[...]
Here is the summary with links:
- [v2,1/2] ARM: dts: armada-{370-xp,375,38x,39x}: Drop #size-cells from mpic node
https://git.kernel.org/soc/soc/c/2af8d8a583a4 - [v2,2/2] dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML https://git.kernel.org/soc/soc/c/f7e642bcd622
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Marek Behún
maintainerHi Arnd,
the second patch of this series was accepted by Rob Herring into his for-next branch:
https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git/log/?h=for-next
I guess git will handle it during merge, but the commit will appear two times in history.
Marek
Quoted 29 lines · On Fri, Jun 28, 2024 at 09:20:50PM +0000, [email protected]…
Hello:
This series was applied to soc/soc.git (for-next)
by Arnd Bergmann <[email protected]>:Quoted 10 lines · On Mon, 24 Jun 2024 16:53:53 +0200 you wrote:
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[...]
Here is the summary with links:
- [v2,1/2] ARM: dts: armada-{370-xp,375,38x,39x}: Drop #size-cells from mpic nodehttps://git.kernel.org/soc/soc/c/2af8d8a583a4 - [v2,2/2] dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML https://git.kernel.org/soc/soc/c/f7e642bcd622You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html