ath79: enable all space on Netgear ar9344-based WNDR routers

Netgear WNDR routers (AR9344 models) like WNDR4300 have 128 MiB of flash
memory but only first 32 MiB are used now - both by vendor's firmware and
OpenWrt. This patch concatenates two regions of flash memory: ubi part
of firmware partition and reserved (unused) space beyond 'caldata_backup'
while preserving ART backup. No data is wiped or moved away.
This increases area for OS ubi volumes from 23 to 119 Megabytes.

Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>

diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
index 18b9ae17787966bf64629286fc8a1f8deadf2996..38dd052f5f5e8486254ad1bdc5085908c9890146 100644 (file)
--- a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
@@ -96,6 +96,22 @@
                        linux,default-trigger = "usbport";
                };
        };
+
+       ubi-concat {
+               compatible = "mtd-concat";
+               devices = <&ubipart0 &ubipart1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       ubi@8c0000 {
+                               label = "ubi";
+                               reg = <0x0 0x7700000>;
+                       };
+               };
+       };
 };
 
 &pinmux {
@@ -154,8 +170,8 @@
                        reg = <0x6c0000 0x200000>;
                };
 
-               ubi@8c0000 {
-                       label = "ubi";
+               ubipart0: partition@8c0000 {
+                       label = "ubipart0";
                        reg = <0x8c0000 0x1700000>;
                };
 
@@ -171,10 +187,9 @@
                        read-only;
                };
 
-               partition@2000000 {
-                       label = "reserved";
+               ubipart1: partition@2000000 {
+                       label = "ubipart1";
                        reg = <0x2000000 0x6000000>;
-                       read-only;
                };
        };
 };