Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.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 f2aa2a81de4dd2e982ec1e5fd5ae67f01bb08a63..e3b64d03fbd82844aaf65fc862e62d15af042133 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -74,9 +74,10 @@
                                                     <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>;
+                                                    <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";
+                                                         "tx-cpu3", "rx-shared", "link";
                                        port-id = <0>;
                                        gop-port-id = <0>;
                                        status = "disabled";
@@ -87,9 +88,10 @@
                                                     <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>;
+                                                    <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";
+                                                         "tx-cpu3", "rx-shared", "link";
                                        port-id = <1>;
                                        gop-port-id = <2>;
                                        status = "disabled";
@@ -100,15 +102,54 @@
                                                     <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>;
+                                                    <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";
+                                                         "tx-cpu3", "rx-shared", "link";
                                        port-id = <2>;
                                        gop-port-id = <3>;
                                        status = "disabled";
                                };
                        };
 
+                       cpm_comphy: phy@120000 {
+                               compatible = "marvell,comphy-cp110";
+                               reg = <0x120000 0x6000>;
+                               marvell,system-controller = <&cpm_syscon0>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               cpm_comphy0: phy@0 {
+                                       reg = <0>;
+                                       #phy-cells = <1>;
+                               };
+
+                               cpm_comphy1: phy@1 {
+                                       reg = <1>;
+                                       #phy-cells = <1>;
+                               };
+
+                               cpm_comphy2: phy@2 {
+                                       reg = <2>;
+                                       #phy-cells = <1>;
+                               };
+
+                               cpm_comphy3: phy@3 {
+                                       reg = <3>;
+                                       #phy-cells = <1>;
+                               };
+
+                               cpm_comphy4: phy@4 {
+                                       reg = <4>;
+                                       #phy-cells = <1>;
+                               };
+
+                               cpm_comphy5: phy@5 {
+                                       reg = <5>;
+                                       #phy-cells = <1>;
+                               };
+                       };
+
                        cpm_mdio: mdio@12a200 {
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -143,7 +184,7 @@
 
                        cpm_syscon0: system-controller@440000 {
                                compatible = "syscon", "simple-mfd";
-                               reg = <0x440000 0x1000>;
+                               reg = <0x440000 0x2000>;
 
                                cpm_clk: clock {
                                        compatible = "marvell,cp110-clock";
@@ -274,12 +315,14 @@
                                 * this controller is only usable on the CPM
                                 * for A7K and on the CPS for A8K.
                                 */
-                               compatible = "marvell,armada370-nand";
+                               compatible = "marvell,armada-8k-nand",
+                                            "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>;
+                               marvell,system-controller = <&cpm_syscon0>;
                                status = "disabled";
                        };