arm64: dts: marvell: add TX interrupts for PPv2.2

This commit updates the Marvell Armada 7K/8K Device Tree to describe
the TX interrupts of the Ethernet controllers, in both the master and
slave CP110s.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
index 8b019a9f4f59a81d316d983749093ab2dae6e9a5..0bfd4f8cf34e92a4cb211f82d125c6c9395bc643 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -69,21 +69,39 @@
                                dma-coherent;
 
                                cpm_eth0: eth0 {
-                                       interrupts = <ICU_GRP_NSR 39 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupts = <ICU_GRP_NSR 39 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 43 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 47 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 51 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 55 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
+                                                         "tx-cpu3", "rx-shared";
                                        port-id = <0>;
                                        gop-port-id = <0>;
                                        status = "disabled";
                                };
 
                                cpm_eth1: eth1 {
-                                       interrupts = <ICU_GRP_NSR 40 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupts = <ICU_GRP_NSR 40 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 44 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 48 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 52 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 56 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
+                                                         "tx-cpu3", "rx-shared";
                                        port-id = <1>;
                                        gop-port-id = <2>;
                                        status = "disabled";
                                };
 
                                cpm_eth2: eth2 {
-                                       interrupts = <ICU_GRP_NSR 41 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupts = <ICU_GRP_NSR 41 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 45 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 49 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 53 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 57 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
+                                                         "tx-cpu3", "rx-shared";
                                        port-id = <2>;
                                        gop-port-id = <3>;
                                        status = "disabled";

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index 7c1100133731928f5b8653feb1f7738308ddbcce..a020e1001806dee134349a46347daea6d562fd6c 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -69,21 +69,39 @@
                                dma-coherent;
 
                                cps_eth0: eth0 {
-                                       interrupts = <ICU_GRP_NSR 39 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupts = <ICU_GRP_NSR 39 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 43 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 47 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 51 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 55 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
+                                                         "tx-cpu3", "rx-shared";
                                        port-id = <0>;
                                        gop-port-id = <0>;
                                        status = "disabled";
                                };
 
                                cps_eth1: eth1 {
-                                       interrupts = <ICU_GRP_NSR 40 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupts = <ICU_GRP_NSR 40 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 44 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 48 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 52 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 56 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
+                                                         "tx-cpu3", "rx-shared";
                                        port-id = <1>;
                                        gop-port-id = <2>;
                                        status = "disabled";
                                };
 
                                cps_eth2: eth2 {
-                                       interrupts = <ICU_GRP_NSR 41 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupts = <ICU_GRP_NSR 41 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 45 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 49 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 53 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 57 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
+                                                         "tx-cpu3", "rx-shared";
                                        port-id = <2>;
                                        gop-port-id = <3>;
                                        status = "disabled";