ARM64: zynqmp: Update nand device tree node properties

This patch updates the nand device tree node properties as per
updated driver

Signed-off-by: Naga Sureshkumar Relli <nagasure@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/dts/zynqmp-ep108.dts b/arch/arm/dts/zynqmp-ep108.dts
index 9f6b11180e76b3a07d2d5f4aee55fb34a2b68ae0..8157b9eaaf0078ef381ed687af9653ec58ba6990 100644 (file)
--- a/arch/arm/dts/zynqmp-ep108.dts
+++ b/arch/arm/dts/zynqmp-ep108.dts
@@ -81,31 +81,35 @@
 &nand0 {
        status = "okay";
        arasan,has-mdma;
-       num-cs = <1>;
 
-       partition@0 {   /* for testing purpose */
-               label = "nand-fsbl-uboot";
-               reg = <0x0 0x0 0x400000>;
-       };
-       partition@1 {   /* for testing purpose */
-               label = "nand-linux";
-               reg = <0x0 0x400000 0x1400000>;
-       };
-       partition@2 {   /* for testing purpose */
-               label = "nand-device-tree";
-               reg = <0x0 0x1800000 0x400000>;
-       };
-       partition@3 {   /* for testing purpose */
-               label = "nand-rootfs";
-               reg = <0x0 0x1C00000 0x1400000>;
-       };
-       partition@4 {   /* for testing purpose */
-               label = "nand-bitstream";
-               reg = <0x0 0x3000000 0x400000>;
-       };
-       partition@5 {   /* for testing purpose */
-               label = "nand-misc";
-               reg = <0x0 0x3400000 0xFCC00000>;
+       nand@0 {
+               reg = <0x0>;
+               #address-cells = <0x2>;
+               #size-cells = <0x1>;
+               partition@0 {   /* for testing purpose */
+                       label = "nand-fsbl-uboot";
+                       reg = <0x0 0x0 0x400000>;
+               };
+               partition@1 {   /* for testing purpose */
+                       label = "nand-linux";
+                       reg = <0x0 0x400000 0x1400000>;
+               };
+               partition@2 {   /* for testing purpose */
+                       label = "nand-device-tree";
+                       reg = <0x0 0x1800000 0x400000>;
+               };
+               partition@3 {   /* for testing purpose */
+                       label = "nand-rootfs";
+                       reg = <0x0 0x1c00000 0x1400000>;
+               };
+               partition@4 {   /* for testing purpose */
+                       label = "nand-bitstream";
+                       reg = <0x0 0x3000000 0x400000>;
+               };
+               partition@5 {   /* for testing purpose */
+                       label = "nand-misc";
+                       reg = <0x0 0x3400000 0xfcc00000>;
+               };
        };
 };
 

diff --git a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
index bae514f994f37d57e7f2c695ae931c935d7354b4..49d0339f73f7f87bf5e4e0768b58d60942bf91cd 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
@@ -130,56 +130,66 @@
 &nand0 {
        status = "okay";
        arasan,has-mdma;
-       num-cs = <2>;
 
-       partition@0 {   /* for testing purpose */
-               label = "nand-fsbl-uboot";
-               reg = <0x0 0x0 0x400000>;
-       };
-       partition@1 {   /* for testing purpose */
-               label = "nand-linux";
-               reg = <0x0 0x400000 0x1400000>;
-       };
-       partition@2 {   /* for testing purpose */
-               label = "nand-device-tree";
-               reg = <0x0 0x1800000 0x400000>;
-       };
-       partition@3 {   /* for testing purpose */
-               label = "nand-rootfs";
-               reg = <0x0 0x1C00000 0x1400000>;
-       };
-       partition@4 {   /* for testing purpose */
-               label = "nand-bitstream";
-               reg = <0x0 0x3000000 0x400000>;
-       };
-       partition@5 {   /* for testing purpose */
-               label = "nand-misc";
-               reg = <0x0 0x3400000 0xFCC00000>;
-       };
+       nand@0 {
+               reg = <0x0>;
+               #address-cells = <0x2>;
+               #size-cells = <0x1>;
 
-       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@0 {   /* for testing purpose */
+                       label = "nand-fsbl-uboot";
+                       reg = <0x0 0x0 0x400000>;
+               };
+               partition@1 {   /* for testing purpose */
+                       label = "nand-linux";
+                       reg = <0x0 0x400000 0x1400000>;
+               };
+               partition@2 {   /* for testing purpose */
+                       label = "nand-device-tree";
+                       reg = <0x0 0x1800000 0x400000>;
+               };
+               partition@3 {   /* for testing purpose */
+                       label = "nand-rootfs";
+                       reg = <0x0 0x1c00000 0x1400000>;
+               };
+               partition@4 {   /* for testing purpose */
+                       label = "nand-bitstream";
+                       reg = <0x0 0x3000000 0x400000>;
+               };
+               partition@5 {   /* for testing purpose */
+                       label = "nand-misc";
+                       reg = <0x0 0x3400000 0xfcc00000>;
+               };
        };
-       partition@11 {  /* for testing purpose */
-               label = "nand1-misc";
-               reg = <0x1 0x3400000 0xFCC00000>;
+       nand@1 {
+               reg = <0x1>;
+               #address-cells = <0x2>;
+               #size-cells = <0x1>;
+
+               partition@0 {   /* for testing purpose */
+                       label = "nand1-fsbl-uboot";
+                       reg = <0x0 0x0 0x400000>;
+               };
+               partition@1 {   /* for testing purpose */
+                       label = "nand1-linux";
+                       reg = <0x0 0x400000 0x1400000>;
+               };
+               partition@2 {   /* for testing purpose */
+                       label = "nand1-device-tree";
+                       reg = <0x0 0x1800000 0x400000>;
+               };
+               partition@3 {   /* for testing purpose */
+                       label = "nand1-rootfs";
+                       reg = <0x0 0x1c00000 0x1400000>;
+               };
+               partition@4 {   /* for testing purpose */
+                       label = "nand1-bitstream";
+                       reg = <0x0 0x3000000 0x400000>;
+               };
+               partition@5 {   /* for testing purpose */
+                       label = "nand1-misc";
+                       reg = <0x0 0x3400000 0xfcc00000>;
+               };
        };
 };
 

diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
index f18d7004bac42e981dfd042f69c5b91b43a7877e..313bde44b83e06a4f4d7357ac0e4ae7b2cf34916 100644 (file)
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -568,8 +568,8 @@
                        clock-names = "clk_sys", "clk_flash";
                        interrupt-parent = <&gic>;
                        interrupts = <0 14 4>;
-                       #address-cells = <2>;
-                       #size-cells = <1>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        #stream-id-cells = <1>;
                        iommus = <&smmu 0x872>;
                        power-domains = <&pd_nand>;