ath79: fix first reboot issue on Netgear WNDR4300 v2 and WNDR4500 v3

[openwrt/staging/neocturne.git] / target / linux / ath79 / dts / qca9563_netgear_wndr.dtsi

diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
index a51fb1964b0432351e1fc62dbe80ddff304851e2..799297f4e15ffc2ab90580cc256f6e35af3ca963 100644 (file)
--- a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
@@ -90,6 +90,22 @@
                        linux,default-trigger = "phy1tpt";
                };
        };
+
+       ubi-concat {
+               compatible = "mtd-concat";
+               devices = <&ubiconcat0 &ubiconcat1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "ubi";
+                               reg = <0x0 0x0>;
+                       };
+               };
+       };
 };
 
 &spi {
@@ -165,10 +181,20 @@
                                reg = <0x0 0x400000>;
                        };
 
-                       partition@400000 {
-                               label = "ubi";
-                               reg = <0x400000 0x7c00000>;
+                       ubiconcat0: partition@400000 {
+                               label = "ubiconcat0";
+                               reg = <0x400000 0x5c00000>;
+                       };
+
+                       ubiconcat1: partition@6020000 {
+                               label = "ubiconcat1";
+                               reg = <0x6020000 0x1f60000>;
                        };
+                       /*
+                        * U-boot always unconditionally marks block 768, 1020 - 1023 as
+                        * bad blocks on each boot. To avoid conflicts with the nand
+                        * driver, manually skip them.
+                        */
                };
        };
 };