Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[mirror_ubuntu-focal-kernel.git] / arch / arm64 / boot / dts / marvell / armada-cp110-master.dtsi

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
index 4c68605675a83db1639c0efed23788379c4d9e17..8263a8a504a8fd11896da6aebc99eabdd4be928a 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -65,25 +65,44 @@
                                reg = <0x0 0x100000>, <0x129000 0xb000>;
                                clocks = <&cpm_clk 1 3>, <&cpm_clk 1 9>, <&cpm_clk 1 5>;
                                clock-names = "pp_clk", "gop_clk", "mg_clk";
+                               marvell,system-controller = <&cpm_syscon0>;
                                status = "disabled";
                                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";
@@ -115,6 +134,13 @@
                                msi-parent = <&gicp>;
                        };
 
+                       cpm_rtc: rtc@284000 {
+                               compatible = "marvell,armada-8k-rtc";
+                               reg = <0x284000 0x20>, <0x284080 0x24>;
+                               reg-names = "rtc", "rtc-soc";
+                               interrupts = <ICU_GRP_NSR 77 IRQ_TYPE_LEVEL_HIGH>;
+                       };
+
                        cpm_syscon0: system-controller@440000 {
                                compatible = "syscon", "simple-mfd";
                                reg = <0x440000 0x1000>;
@@ -131,8 +157,12 @@
                                        gpio-controller;
                                        #gpio-cells = <2>;
                                        gpio-ranges = <&cpm_pinctrl 0 0 32>;
+                                       interrupt-controller;
+                                       interrupts = <ICU_GRP_NSR 86 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 85 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 84 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 83 IRQ_TYPE_LEVEL_HIGH>;
                                        status = "disabled";
-
                                };
 
                                cpm_gpio2: gpio@140 {
@@ -142,26 +172,15 @@
                                        gpio-controller;
                                        #gpio-cells = <2>;
                                        gpio-ranges = <&cpm_pinctrl 0 32 31>;
+                                       interrupt-controller;
+                                       interrupts = <ICU_GRP_NSR 82 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 81 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 80 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <ICU_GRP_NSR 79 IRQ_TYPE_LEVEL_HIGH>;
                                        status = "disabled";
                                };
                        };
 
-                       cpm_rtc: rtc@284000 {
-                               compatible = "marvell,armada-8k-rtc";
-                               reg = <0x284000 0x20>, <0x284080 0x24>;
-                               reg-names = "rtc", "rtc-soc";
-                               interrupts = <ICU_GRP_NSR 77 IRQ_TYPE_LEVEL_HIGH>;
-                       };
-
-                       cpm_sata0: sata@540000 {
-                               compatible = "marvell,armada-8k-ahci",
-                                            "generic-ahci";
-                               reg = <0x540000 0x30000>;
-                               interrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&cpm_clk 1 15>;
-                               status = "disabled";
-                       };
-
                        cpm_usb3_0: usb3@500000 {
                                compatible = "marvell,armada-8k-xhci",
                                             "generic-xhci";
@@ -182,6 +201,15 @@
                                status = "disabled";
                        };
 
+                       cpm_sata0: sata@540000 {
+                               compatible = "marvell,armada-8k-ahci",
+                                            "generic-ahci";
+                               reg = <0x540000 0x30000>;
+                               interrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&cpm_clk 1 15>;
+                               status = "disabled";
+                       };
+
                        cpm_xor0: xor@6a0000 {
                                compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
                                reg = <0x6a0000 0x1000>,
@@ -240,6 +268,21 @@
                                status = "disabled";
                        };
 
+                       cpm_nand: nand@720000 {
+                               /*
+                                * Due to the limiation of the pin available
+                                * this controller is only usable on the CPM
+                                * for A7K and on the CPS for A8K.
+                                */
+                               compatible = "marvell,armada370-nand";
+                               reg = <0x720000 0x54>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+                               interrupts = <ICU_GRP_NSR 115 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&cpm_clk 1 2>;
+                               status = "disabled";
+                       };
+
                        cpm_trng: trng@760000 {
                                compatible = "marvell,armada-8k-rng", "inside-secure,safexcel-eip76";
                                reg = <0x760000 0x7d>;