ARM64: zynqmp: update the nand node with clock and chip select info

Added clock specification.
Added chip select information.
It is possible that the nand flash device(s) size can be > 4GB. So,
Increased
the address cycles property value to 2.
Since DC2 hw contains two flash devices and each flash size is 4GB,
modified the
partition table to accommodate the second flash and also added
partitions to
cover the whole flash size.

Signed-off-by: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
index fc935e586a44dda358205fca2e1c93cc3b717538..e58c0eab5c21e6dfcf8db8df5018a7b57cb80c95 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
@@ -170,25 +170,57 @@
 &nand0 {
        status = "okay";
        arasan,has-mdma;
+       num-cs = <2>;
+       clocks = <&clk100 &clk100>;
+
        partition@0 {   /* for testing purpose */
                label = "nand-fsbl-uboot";
-               reg = <0x0 0x400000>;
+               reg = <0x0 0x0 0x400000>;
        };
        partition@1 {   /* for testing purpose */
                label = "nand-linux";
-               reg = <0x400000 0x1400000>;
+               reg = <0x0 0x400000 0x1400000>;
        };
        partition@2 {   /* for testing purpose */
                label = "nand-device-tree";
-               reg = <0x1800000 0x400000>;
+               reg = <0x0 0x1800000 0x400000>;
        };
        partition@3 {   /* for testing purpose */
                label = "nand-rootfs";
-               reg = <0x1C00000 0x1400000>;
+               reg = <0x0 0x1C00000 0x1400000>;
        };
        partition@4 {   /* for testing purpose */
                label = "nand-bitstream";
-               reg = <0x3000000 0x400000>;
+               reg = <0x0 0x3000000 0x400000>;
+       };
+       partition@5 {   /* for testing purpose */
+               label = "nand-misc";
+               reg = <0x0 0x3400000 0xFCC00000>;
+       };
+
+       partition@6 {   /* for testing purpose */
+               label = "nand1-fsbl-uboot";
+               reg = <0x1 0x0 0x400000>;
+       };
+       partition@7 {   /* for testing purpose */
+               label = "nand1-linux";
+               reg = <0x1 0x400000 0x1400000>;
+       };
+       partition@8 {   /* for testing purpose */
+               label = "nand1-device-tree";
+               reg = <0x1 0x1800000 0x400000>;
+       };
+       partition@9 {   /* for testing purpose */
+               label = "nand1-rootfs";
+               reg = <0x1 0x1C00000 0x1400000>;
+       };
+       partition@10 {  /* for testing purpose */
+               label = "nand1-bitstream";
+               reg = <0x1 0x3000000 0x400000>;
+       };
+       partition@11 {  /* for testing purpose */
+               label = "nand1-misc";
+               reg = <0x1 0x3400000 0xFCC00000>;
        };
 };
 

diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
index 5e357e4b8b3d9c564e71c8246ebef3aa5c20da48..86f6a4ac86e02fe947c4fa52f7c713ae0d672519 100644 (file)
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -298,9 +298,10 @@
                        compatible = "arasan,nfc-v3p10";
                        status = "disabled";
                        reg = <0x0 0xff100000 0x1000>;
+                       clock-names = "clk_sys", "clk_flash";
                        interrupt-parent = <&gic>;
                        interrupts = <0 14 4>;
-                       #address-cells = <1>;
+                       #address-cells = <2>;
                        #size-cells = <1>;
                };