arm64: dts: zynqmp: Fix nand dt node

DC3 nand node is not correct, it is showing all partitions under
controller node directly. Create two sub nand nodes with partitions for
each.

Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@amd.com>
Link: https://lore.kernel.org/r/20230224050709.30014-4-ashok.reddy.soma@amd.com
Signed-off-by: Michal Simek <michal.simek@amd.com>

diff --git a/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts b/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts
index 13812470ae34b998ff6bc192eacb6c73effe006a..8a06c2a90a977e7964fcc261156f5f2bfb71f35b 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts
@@ -128,54 +128,77 @@
        arasan,has-mdma;
        num-cs = <2>;
 
-       partition@0 {   /* for testing purpose */
-               label = "nand-fsbl-uboot";
-               reg = <0x0 0x0 0x400000>;
+       nand@0 {
+               reg = <0x0>;
+               #address-cells = <0x2>;
+               #size-cells = <0x1>;
+               nand-ecc-mode = "soft";
+               nand-ecc-algo = "bch";
+               nand-rb = <0>;
+               label = "main-storage-0";
+               nand-ecc-step-size = <1024>;
+               nand-ecc-strength = <24>;
+
+               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@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@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>;
+       nand@1 {
+               reg = <0x1>;
+               #address-cells = <0x2>;
+               #size-cells = <0x1>;
+               nand-ecc-mode = "soft";
+               nand-ecc-algo = "bch";
+               nand-rb = <0>;
+               label = "main-storage-1";
+               nand-ecc-step-size = <1024>;
+               nand-ecc-strength = <24>;
+
+               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>;
+               };
        };
 };