ipq806x: fix NAND support for linux 4.9

[openwrt/openwrt.git] / target / linux / ipq806x / files-4.9 / arch / arm / boot / dts / qcom-ipq8064-ea8500.dts

diff --git a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
index 591e535df7188ba90157935ed1e6d0b687ca5bfd..761fa43179f6347c7fc1c6b3a3a48621ff56997e 100644 (file)
--- a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
+++ b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
@@ -176,110 +176,119 @@
                        pinctrl-0 = <&nand_pins>;
                        pinctrl-names = "default";
 
-                       nand-ecc-strength = <4>;
-                       nand-bus-width = <8>;
-
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       SBL1@0 {
-                               label = "SBL1";
-                               reg = <0x0000000 0x0040000>;
-                               read-only;
-                       };
-
-                       MIBIB@40000 {
-                               label = "MIBIB";
-                               reg = <0x0040000 0x0140000>;
-                               read-only;
-                       };
-
-                       SBL2@180000 {
-                               label = "SBL2";
-                               reg = <0x0180000 0x0140000>;
-                               read-only;
-                       };
-
-                       SBL3@2c0000 {
-                               label = "SBL3";
-                               reg = <0x02c0000 0x0280000>;
-                               read-only;
-                       };
-
-                       DDRCONFIG@540000 {
-                               label = "DDRCONFIG";
-                               reg = <0x0540000 0x0120000>;
-                               read-only;
-                       };
-
-                       SSD@660000 {
-                               label = "SSD";
-                               reg = <0x0660000 0x0120000>;
-                               read-only;
-                       };
-
-                       TZ@780000 {
-                               label = "TZ";
-                               reg = <0x0780000 0x0280000>;
-                               read-only;
-                       };
-
-                       RPM@a00000 {
-                               label = "RPM";
-                               reg = <0x0a00000 0x0280000>;
-                               read-only;
-                       };
-
-                       art: art@c80000 {
-                               label = "art";
-                               reg = <0x0c80000 0x0140000>;
-                               read-only;
-                       };
-
-                       APPSBL@dc0000 {
-                               label = "APPSBL";
-                               reg = <0x0dc0000 0x0100000>;
-                               read-only;
-                       };
-
-                       u_env@ec0000 {
-                               label = "u_env";
-                               reg = <0x0ec0000 0x0040000>;
-                       };
-
-                       s_env@f00000 {
-                               label = "s_env";
-                               reg = <0x0f00000 0x0040000>;
-                       };
-
-                       devinfo@f40000 {
-                               label = "devinfo";
-                               reg = <0x0f40000 0x0040000>;
-                       };
-
-                       linux@f80000 { 
-                               label = "kernel1";
-                               reg = <0x0f80000 0x2800000>;  /* 3 MB spill to rootfs*/
-                       };
-
-                       rootfs@1280000 {
-                               label = "rootfs1";
-                               reg = <0x1280000 0x2500000>;
-                       };
-
-                       linux2@3780000 {
-                               label = "kernel2";
-                               reg = <0x3780000 0x2800000>;
-                       };
-
-                       rootfs2@3a80000 {
-                               label = "rootfs2";
-                               reg = <0x3a80000 0x2500000>;
-                       };
-
-                       syscfg@5f80000 {
-                               label = "syscfg";
-                               reg = <0x5f80000 0x2080000>;
+                       cs0 {
+                               reg = <0>;
+                               compatible = "qcom,nandcs";
+
+                               nand-ecc-strength = <4>;
+                               nand-bus-width = <8>;
+                               nand-ecc-step-size = <512>;
+
+                               partitions {
+                                       compatible = "fixed-partitions";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       SBL1@0 {
+                                               label = "SBL1";
+                                               reg = <0x0000000 0x0040000>;
+                                               read-only;
+                                       };
+
+                                       MIBIB@40000 {
+                                               label = "MIBIB";
+                                               reg = <0x0040000 0x0140000>;
+                                               read-only;
+                                       };
+
+                                       SBL2@180000 {
+                                               label = "SBL2";
+                                               reg = <0x0180000 0x0140000>;
+                                               read-only;
+                                       };
+
+                                       SBL3@2c0000 {
+                                               label = "SBL3";
+                                               reg = <0x02c0000 0x0280000>;
+                                               read-only;
+                                       };
+
+                                       DDRCONFIG@540000 {
+                                               label = "DDRCONFIG";
+                                               reg = <0x0540000 0x0120000>;
+                                               read-only;
+                                       };
+
+                                       SSD@660000 {
+                                               label = "SSD";
+                                               reg = <0x0660000 0x0120000>;
+                                               read-only;
+                                       };
+
+                                       TZ@780000 {
+                                               label = "TZ";
+                                               reg = <0x0780000 0x0280000>;
+                                               read-only;
+                                       };
+
+                                       RPM@a00000 {
+                                               label = "RPM";
+                                               reg = <0x0a00000 0x0280000>;
+                                               read-only;
+                                       };
+
+                                       art: art@c80000 {
+                                               label = "art";
+                                               reg = <0x0c80000 0x0140000>;
+                                               read-only;
+                                       };
+
+                                       APPSBL@dc0000 {
+                                               label = "APPSBL";
+                                               reg = <0x0dc0000 0x0100000>;
+                                               read-only;
+                                       };
+
+                                       u_env@ec0000 {
+                                               label = "u_env";
+                                               reg = <0x0ec0000 0x0040000>;
+                                       };
+
+                                       s_env@f00000 {
+                                               label = "s_env";
+                                               reg = <0x0f00000 0x0040000>;
+                                       };
+
+                                       devinfo@f40000 {
+                                               label = "devinfo";
+                                               reg = <0x0f40000 0x0040000>;
+                                       };
+
+                                       linux@f80000 { 
+                                               label = "kernel1";
+                                               reg = <0x0f80000 0x2800000>;  /* 3 MB spill to rootfs*/
+                                       };
+
+                                       rootfs@1280000 {
+                                               label = "rootfs1";
+                                               reg = <0x1280000 0x2500000>;
+                                       };
+
+                                       linux2@3780000 {
+                                               label = "kernel2";
+                                               reg = <0x3780000 0x2800000>;
+                                       };
+
+                                       rootfs2@3a80000 {
+                                               label = "rootfs2";
+                                               reg = <0x3a80000 0x2500000>;
+                                       };
+
+                                       syscfg@5f80000 {
+                                               label = "syscfg";
+                                               reg = <0x5f80000 0x2080000>;
+                                       };
+                               };
                        };
                };