* [PATCH 1/2] arm64: dts: marvell: armada-cp110: change the PPv2 IRQ names @ 2018-09-24 9:00 Antoine Tenart 2018-09-24 9:00 ` [PATCH 2/2] arm64: dts: marvell: armada-cp110: describe more PPv2 interrupts Antoine Tenart 2018-09-26 12:29 ` [PATCH 1/2] arm64: dts: marvell: armada-cp110: change the PPv2 IRQ names Gregory CLEMENT 0 siblings, 2 replies; 4+ messages in thread From: Antoine Tenart @ 2018-09-24 9:00 UTC (permalink / raw) To: linux-arm-kernel This patch changes the PPv2 IRQ names in the CP110 device tree to match a corresponding change in the Marvell PPv2 driver. The reason this was updated is the IRQ where names after Tx/Rx interrupts, but this is not true and can be configured. A following patch will add more of them and the names wouldn't make sense. Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com> --- arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi index 840c8454d03e..6a13690cf1e4 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi @@ -53,8 +53,8 @@ <ICU_GRP_NSR 51 IRQ_TYPE_LEVEL_HIGH>, <ICU_GRP_NSR 55 IRQ_TYPE_LEVEL_HIGH>, <ICU_GRP_NSR 129 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2", - "tx-cpu3", "rx-shared", "link"; + interrupt-names = "hif0", "hif1", "hif2", + "hif3", "hif4", "link"; port-id = <0>; gop-port-id = <0>; status = "disabled"; @@ -67,8 +67,8 @@ <ICU_GRP_NSR 52 IRQ_TYPE_LEVEL_HIGH>, <ICU_GRP_NSR 56 IRQ_TYPE_LEVEL_HIGH>, <ICU_GRP_NSR 128 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2", - "tx-cpu3", "rx-shared", "link"; + interrupt-names = "hif0", "hif1", "hif2", + "hif3", "hif4", "link"; port-id = <1>; gop-port-id = <2>; status = "disabled"; @@ -81,8 +81,8 @@ <ICU_GRP_NSR 53 IRQ_TYPE_LEVEL_HIGH>, <ICU_GRP_NSR 57 IRQ_TYPE_LEVEL_HIGH>, <ICU_GRP_NSR 127 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2", - "tx-cpu3", "rx-shared", "link"; + interrupt-names = "hif0", "hif1", "hif2", + "hif3", "hif4", "link"; port-id = <2>; gop-port-id = <3>; status = "disabled"; -- 2.17.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] arm64: dts: marvell: armada-cp110: describe more PPv2 interrupts 2018-09-24 9:00 [PATCH 1/2] arm64: dts: marvell: armada-cp110: change the PPv2 IRQ names Antoine Tenart @ 2018-09-24 9:00 ` Antoine Tenart 2018-09-26 12:30 ` Gregory CLEMENT 2018-09-26 12:29 ` [PATCH 1/2] arm64: dts: marvell: armada-cp110: change the PPv2 IRQ names Gregory CLEMENT 1 sibling, 1 reply; 4+ messages in thread From: Antoine Tenart @ 2018-09-24 9:00 UTC (permalink / raw) To: linux-arm-kernel This patch describes 3 additional interrupts per PPv2 port. Those interrupts will be used later in future versions of the Marvell PPv2 driver, and now the device tree description matches the hardware capabilities. Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com> --- arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi index 6a13690cf1e4..26d6e602d1ec 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi @@ -52,9 +52,14 @@ <ICU_GRP_NSR 47 IRQ_TYPE_LEVEL_HIGH>, <ICU_GRP_NSR 51 IRQ_TYPE_LEVEL_HIGH>, <ICU_GRP_NSR 55 IRQ_TYPE_LEVEL_HIGH>, + <ICU_GRP_NSR 59 IRQ_TYPE_LEVEL_HIGH>, + <ICU_GRP_NSR 63 IRQ_TYPE_LEVEL_HIGH>, + <ICU_GRP_NSR 67 IRQ_TYPE_LEVEL_HIGH>, + <ICU_GRP_NSR 71 IRQ_TYPE_LEVEL_HIGH>, <ICU_GRP_NSR 129 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "hif0", "hif1", "hif2", - "hif3", "hif4", "link"; + "hif3", "hif4", "hif5", "hif6", "hif7", + "hif8", "link"; port-id = <0>; gop-port-id = <0>; status = "disabled"; @@ -66,9 +71,14 @@ <ICU_GRP_NSR 48 IRQ_TYPE_LEVEL_HIGH>, <ICU_GRP_NSR 52 IRQ_TYPE_LEVEL_HIGH>, <ICU_GRP_NSR 56 IRQ_TYPE_LEVEL_HIGH>, + <ICU_GRP_NSR 60 IRQ_TYPE_LEVEL_HIGH>, + <ICU_GRP_NSR 64 IRQ_TYPE_LEVEL_HIGH>, + <ICU_GRP_NSR 68 IRQ_TYPE_LEVEL_HIGH>, + <ICU_GRP_NSR 72 IRQ_TYPE_LEVEL_HIGH>, <ICU_GRP_NSR 128 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "hif0", "hif1", "hif2", - "hif3", "hif4", "link"; + "hif3", "hif4", "hif5", "hif6", "hif7", + "hif8", "link"; port-id = <1>; gop-port-id = <2>; status = "disabled"; @@ -80,9 +90,14 @@ <ICU_GRP_NSR 49 IRQ_TYPE_LEVEL_HIGH>, <ICU_GRP_NSR 53 IRQ_TYPE_LEVEL_HIGH>, <ICU_GRP_NSR 57 IRQ_TYPE_LEVEL_HIGH>, + <ICU_GRP_NSR 61 IRQ_TYPE_LEVEL_HIGH>, + <ICU_GRP_NSR 65 IRQ_TYPE_LEVEL_HIGH>, + <ICU_GRP_NSR 69 IRQ_TYPE_LEVEL_HIGH>, + <ICU_GRP_NSR 73 IRQ_TYPE_LEVEL_HIGH>, <ICU_GRP_NSR 127 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "hif0", "hif1", "hif2", - "hif3", "hif4", "link"; + "hif3", "hif4", "hif5", "hif6", "hif7", + "hif8", "link"; port-id = <2>; gop-port-id = <3>; status = "disabled"; -- 2.17.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] arm64: dts: marvell: armada-cp110: describe more PPv2 interrupts 2018-09-24 9:00 ` [PATCH 2/2] arm64: dts: marvell: armada-cp110: describe more PPv2 interrupts Antoine Tenart @ 2018-09-26 12:30 ` Gregory CLEMENT 0 siblings, 0 replies; 4+ messages in thread From: Gregory CLEMENT @ 2018-09-26 12:30 UTC (permalink / raw) To: linux-arm-kernel Hi Antoine, On lun., sept. 24 2018, Antoine Tenart <antoine.tenart@bootlin.com> wrote: > This patch describes 3 additional interrupts per PPv2 port. Those > interrupts will be used later in future versions of the Marvell PPv2 > driver, and now the device tree description matches the hardware > capabilities. > > Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com> Applied on mvebu/dt64 Thanks, Gregory > --- > arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 21 ++++++++++++++++--- > 1 file changed, 18 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi > index 6a13690cf1e4..26d6e602d1ec 100644 > --- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi > +++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi > @@ -52,9 +52,14 @@ > <ICU_GRP_NSR 47 IRQ_TYPE_LEVEL_HIGH>, > <ICU_GRP_NSR 51 IRQ_TYPE_LEVEL_HIGH>, > <ICU_GRP_NSR 55 IRQ_TYPE_LEVEL_HIGH>, > + <ICU_GRP_NSR 59 IRQ_TYPE_LEVEL_HIGH>, > + <ICU_GRP_NSR 63 IRQ_TYPE_LEVEL_HIGH>, > + <ICU_GRP_NSR 67 IRQ_TYPE_LEVEL_HIGH>, > + <ICU_GRP_NSR 71 IRQ_TYPE_LEVEL_HIGH>, > <ICU_GRP_NSR 129 IRQ_TYPE_LEVEL_HIGH>; > interrupt-names = "hif0", "hif1", "hif2", > - "hif3", "hif4", "link"; > + "hif3", "hif4", "hif5", "hif6", "hif7", > + "hif8", "link"; > port-id = <0>; > gop-port-id = <0>; > status = "disabled"; > @@ -66,9 +71,14 @@ > <ICU_GRP_NSR 48 IRQ_TYPE_LEVEL_HIGH>, > <ICU_GRP_NSR 52 IRQ_TYPE_LEVEL_HIGH>, > <ICU_GRP_NSR 56 IRQ_TYPE_LEVEL_HIGH>, > + <ICU_GRP_NSR 60 IRQ_TYPE_LEVEL_HIGH>, > + <ICU_GRP_NSR 64 IRQ_TYPE_LEVEL_HIGH>, > + <ICU_GRP_NSR 68 IRQ_TYPE_LEVEL_HIGH>, > + <ICU_GRP_NSR 72 IRQ_TYPE_LEVEL_HIGH>, > <ICU_GRP_NSR 128 IRQ_TYPE_LEVEL_HIGH>; > interrupt-names = "hif0", "hif1", "hif2", > - "hif3", "hif4", "link"; > + "hif3", "hif4", "hif5", "hif6", "hif7", > + "hif8", "link"; > port-id = <1>; > gop-port-id = <2>; > status = "disabled"; > @@ -80,9 +90,14 @@ > <ICU_GRP_NSR 49 IRQ_TYPE_LEVEL_HIGH>, > <ICU_GRP_NSR 53 IRQ_TYPE_LEVEL_HIGH>, > <ICU_GRP_NSR 57 IRQ_TYPE_LEVEL_HIGH>, > + <ICU_GRP_NSR 61 IRQ_TYPE_LEVEL_HIGH>, > + <ICU_GRP_NSR 65 IRQ_TYPE_LEVEL_HIGH>, > + <ICU_GRP_NSR 69 IRQ_TYPE_LEVEL_HIGH>, > + <ICU_GRP_NSR 73 IRQ_TYPE_LEVEL_HIGH>, > <ICU_GRP_NSR 127 IRQ_TYPE_LEVEL_HIGH>; > interrupt-names = "hif0", "hif1", "hif2", > - "hif3", "hif4", "link"; > + "hif3", "hif4", "hif5", "hif6", "hif7", > + "hif8", "link"; > port-id = <2>; > gop-port-id = <3>; > status = "disabled"; > -- > 2.17.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- Gregory Clement, Bootlin Embedded Linux and Kernel engineering http://bootlin.com ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] arm64: dts: marvell: armada-cp110: change the PPv2 IRQ names 2018-09-24 9:00 [PATCH 1/2] arm64: dts: marvell: armada-cp110: change the PPv2 IRQ names Antoine Tenart 2018-09-24 9:00 ` [PATCH 2/2] arm64: dts: marvell: armada-cp110: describe more PPv2 interrupts Antoine Tenart @ 2018-09-26 12:29 ` Gregory CLEMENT 1 sibling, 0 replies; 4+ messages in thread From: Gregory CLEMENT @ 2018-09-26 12:29 UTC (permalink / raw) To: linux-arm-kernel Hi Antoine, On lun., sept. 24 2018, Antoine Tenart <antoine.tenart@bootlin.com> wrote: > This patch changes the PPv2 IRQ names in the CP110 device tree to match > a corresponding change in the Marvell PPv2 driver. The reason this was > updated is the IRQ where names after Tx/Rx interrupts, but this is not > true and can be configured. A following patch will add more of them and > the names wouldn't make sense. > > Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com> Applied on mvebu/dt64 Thanks, Gregory > --- > arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi > index 840c8454d03e..6a13690cf1e4 100644 > --- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi > +++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi > @@ -53,8 +53,8 @@ > <ICU_GRP_NSR 51 IRQ_TYPE_LEVEL_HIGH>, > <ICU_GRP_NSR 55 IRQ_TYPE_LEVEL_HIGH>, > <ICU_GRP_NSR 129 IRQ_TYPE_LEVEL_HIGH>; > - interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2", > - "tx-cpu3", "rx-shared", "link"; > + interrupt-names = "hif0", "hif1", "hif2", > + "hif3", "hif4", "link"; > port-id = <0>; > gop-port-id = <0>; > status = "disabled"; > @@ -67,8 +67,8 @@ > <ICU_GRP_NSR 52 IRQ_TYPE_LEVEL_HIGH>, > <ICU_GRP_NSR 56 IRQ_TYPE_LEVEL_HIGH>, > <ICU_GRP_NSR 128 IRQ_TYPE_LEVEL_HIGH>; > - interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2", > - "tx-cpu3", "rx-shared", "link"; > + interrupt-names = "hif0", "hif1", "hif2", > + "hif3", "hif4", "link"; > port-id = <1>; > gop-port-id = <2>; > status = "disabled"; > @@ -81,8 +81,8 @@ > <ICU_GRP_NSR 53 IRQ_TYPE_LEVEL_HIGH>, > <ICU_GRP_NSR 57 IRQ_TYPE_LEVEL_HIGH>, > <ICU_GRP_NSR 127 IRQ_TYPE_LEVEL_HIGH>; > - interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2", > - "tx-cpu3", "rx-shared", "link"; > + interrupt-names = "hif0", "hif1", "hif2", > + "hif3", "hif4", "link"; > port-id = <2>; > gop-port-id = <3>; > status = "disabled"; > -- > 2.17.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- Gregory Clement, Bootlin Embedded Linux and Kernel engineering http://bootlin.com ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-09-26 12:30 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-09-24 9:00 [PATCH 1/2] arm64: dts: marvell: armada-cp110: change the PPv2 IRQ names Antoine Tenart 2018-09-24 9:00 ` [PATCH 2/2] arm64: dts: marvell: armada-cp110: describe more PPv2 interrupts Antoine Tenart 2018-09-26 12:30 ` Gregory CLEMENT 2018-09-26 12:29 ` [PATCH 1/2] arm64: dts: marvell: armada-cp110: change the PPv2 IRQ names Gregory CLEMENT
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).