4 files changed, 49 insertions, 2 deletions

diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
index 8588c6de3c8e..8f3b395c786c 100644
--- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
@@ -146,6 +146,36 @@
         };
 };
 
+&cpm_nand {
+        /*
+         * SPI on CPM and NAND have common pins on this board. We can
+         * use only one at a time. To enable the NAND (whihch will
+         * disable the SPI), the "status = "okay";" line have to be
+         * added here.
+         */
+        num-cs = <1>;
+        pinctrl-0 = <&nand_pins>, <&nand_rb>;
+        pinctrl-names = "default";
+        nand-ecc-strength = <4>;
+        nand-ecc-step-size = <512>;
+        marvell,nand-enable-arbiter;
+        nand-on-flash-bbt;
+
+        partition@0 {
+                label = "U-Boot";
+                reg = <0 0x200000>;
+        };
+        partition@200000 {
+                label = "Linux";
+                reg = <0x200000 0xe00000>;
+        };
+        partition@1000000 {
+                label = "Filesystem";
+                reg = <0x1000000 0x3f000000>;
+        };
+};
+
+
 &cpm_spi1 {
         status = "okay";
 
diff --git a/arch/arm64/boot/dts/marvell/armada-70x0.dtsi b/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
index 860b6ae9dcc5..0e1a1e5be399 100644
--- a/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
@@ -64,5 +64,19 @@
 &cpm_syscon0 {
         cpm_pinctrl: pinctrl {
                 compatible = "marvell,armada-7k-pinctrl";
+
+                nand_pins: nand-pins {
+                        marvell,pins =
+                        "mpp15", "mpp16", "mpp17", "mpp18",
+                        "mpp19", "mpp20", "mpp21", "mpp22",
+                        "mpp23", "mpp24", "mpp25", "mpp26",
+                        "mpp27";
+                        marvell,function = "dev";
+                };
+
+                nand_rb: nand-rb {
+                        marvell,pins = "mpp13";
+                        marvell,function = "nf";
+                };
         };
 };
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
index b1119c541f16..19dabc930088 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -315,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";
                         };
 
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index 497d233d6c47..6fd255c064ae 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -316,7 +316,8 @@
                                  * this controller is only usable on the CPM
                                  * for A7K and on the CPS for A8K.
                                  */
-                                compatible = "marvell,armada370-nand";
+                                compatible = "marvell,armada370-nand",
+                                             "marvell,armada370-nand";
                                 reg = <0x720000 0x54>;
                                 #address-cells = <1>;
                                 #size-cells = <1>;