ath79: use the new DT fixed partitions syntax

This new syntax is slightly better designed & uses "compatible" string.
For details see Documentation/devicetree/bindings/mtd/partition.txt .

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts b/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts
index ba6e9ae03c21a892811398d97d71149dae36fb6f..a175fd76980a847e3920b1417f057ea701be7a9a 100644 (file)
--- a/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts
@@ -139,26 +139,32 @@
                reg = <0>;
                spi-max-frequency = <25000000>;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x000000 0x050000>;
-                       read-only;
-               };
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x000000 0x050000>;
+                               read-only;
+                       };
 
-               partition@1 {
-                       label = "u-boot-env";
-                       reg = <0x050000 0x020000>;
-               };
+                       partition@1 {
+                               label = "u-boot-env";
+                               reg = <0x050000 0x020000>;
+                       };
 
-               partition@2 {
-                       label = "firmware";
-                       reg = <0x70000 0xf80000>;
-               };
+                       partition@2 {
+                               label = "firmware";
+                               reg = <0x70000 0xf80000>;
+                       };
 
-               partition@3 {
-                       label = "art";
-                       reg = <0xff0000 0x010000>;
-                       read-only;
+                       partition@3 {
+                               label = "art";
+                               reg = <0xff0000 0x010000>;
+                               read-only;
+                       };
                };
        };
 };

diff --git a/target/linux/ath79/dts/ar7241_ubnt-unifi.dts b/target/linux/ath79/dts/ar7241_ubnt-unifi.dts
index aaafb08424d0665ce7f93def699dc84da3a49fcb..1fa2d82db333adfc29aef8033a4ff4f5fda0a82b 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt-unifi.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt-unifi.dts
@@ -68,37 +68,43 @@
                reg = <0>;
                spi-max-frequency = <25000000>;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x000000 0x040000>;
-               };
-
-               partition@1 {
-                       label = "u-boot-env";
-                       reg = <0x040000 0x010000>;
-               };
-
-               partition@2 {
-                       label = "firmware";
-                       reg = <0x050000 0x750000>;
-               };
-
-               partition@3 {
-                       label = "board_config";
-                       reg = <0x7a0000 0x010000>;
-                       read-only;
-               };
-
-               partition@4 {
-                       label = "cfg";
-                       reg = <0x7b0000 0x040000>;
-                       read-only;
-               };
-
-               art: partition@5 {
-                       label = "art";
-                       reg = <0x7f0000 0x010000>;
-                       read-only;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x000000 0x040000>;
+                       };
+
+                       partition@1 {
+                               label = "u-boot-env";
+                               reg = <0x040000 0x010000>;
+                       };
+
+                       partition@2 {
+                               label = "firmware";
+                               reg = <0x050000 0x750000>;
+                       };
+
+                       partition@3 {
+                               label = "board_config";
+                               reg = <0x7a0000 0x010000>;
+                               read-only;
+                       };
+
+                       partition@4 {
+                               label = "cfg";
+                               reg = <0x7b0000 0x040000>;
+                               read-only;
+                       };
+
+                       art: partition@5 {
+                               label = "art";
+                               reg = <0x7f0000 0x010000>;
+                               read-only;
+                       };
                };
        };
 };

diff --git a/target/linux/ath79/dts/ar7241_ubnt-xm.dtsi b/target/linux/ath79/dts/ar7241_ubnt-xm.dtsi
index cd7da2089bb7246a393e69dfbd845d0c61783da2..ac0a79dc9dff7edbcf8e373419c63347f0fee3f9 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt-xm.dtsi
+++ b/target/linux/ath79/dts/ar7241_ubnt-xm.dtsi
@@ -77,37 +77,43 @@
                reg = <0>;
                spi-max-frequency = <25000000>;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x000000 0x040000>;
-               };
-
-               partition@1 {
-                       label = "u-boot-env";
-                       reg = <0x040000 0x010000>;
-               };
-
-               partition@2 {
-                       label = "firmware";
-                       reg = <0x050000 0x750000>;
-               };
-
-               partition@3 {
-                       label = "board_config";
-                       reg = <0x7a0000 0x010000>;
-                       read-only;
-               };
-
-               partition@4 {
-                       label = "cfg";
-                       reg = <0x7b0000 0x040000>;
-                       read-only;
-               };
-
-               art: partition@5 {
-                       label = "art";
-                       reg = <0x7f0000 0x010000>;
-                       read-only;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x000000 0x040000>;
+                       };
+
+                       partition@1 {
+                               label = "u-boot-env";
+                               reg = <0x040000 0x010000>;
+                       };
+
+                       partition@2 {
+                               label = "firmware";
+                               reg = <0x050000 0x750000>;
+                       };
+
+                       partition@3 {
+                               label = "board_config";
+                               reg = <0x7a0000 0x010000>;
+                               read-only;
+                       };
+
+                       partition@4 {
+                               label = "cfg";
+                               reg = <0x7b0000 0x040000>;
+                               read-only;
+                       };
+
+                       art: partition@5 {
+                               label = "art";
+                               reg = <0x7f0000 0x010000>;
+                               read-only;
+                       };
                };
        };
 };

diff --git a/target/linux/ath79/dts/ar9132_tl_wr1043nd_v1.dts b/target/linux/ath79/dts/ar9132_tl_wr1043nd_v1.dts
index 099941258e8b59341057e71dfbeb5fe25554f280..0ad865bea62a5e281729bb7fa94a728741f8fe35 100644 (file)
--- a/target/linux/ath79/dts/ar9132_tl_wr1043nd_v1.dts
+++ b/target/linux/ath79/dts/ar9132_tl_wr1043nd_v1.dts
@@ -94,20 +94,26 @@
                reg = <0>;
                spi-max-frequency = <25000000>;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x000000 0x020000>;
-               };
-
-               partition@1 {
-                       label = "firmware";
-                       reg = <0x020000 0x7D0000>;
-               };
-
-               partition@2 {
-                       label = "art";
-                       reg = <0x7F0000 0x010000>;
-                       read-only;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x000000 0x020000>;
+                       };
+
+                       partition@1 {
+                               label = "firmware";
+                               reg = <0x020000 0x7D0000>;
+                       };
+
+                       partition@2 {
+                               label = "art";
+                               reg = <0x7F0000 0x010000>;
+                               read-only;
+                       };
                };
        };
 };

diff --git a/target/linux/ath79/dts/ar9330_gl_ar150.dts b/target/linux/ath79/dts/ar9330_gl_ar150.dts
index a41799f0dc3abe8edef295ab048482c3a0a6e4d2..97beab149086f3cb7d42bb187c18b49a5e7c7c40 100644 (file)
--- a/target/linux/ath79/dts/ar9330_gl_ar150.dts
+++ b/target/linux/ath79/dts/ar9330_gl_ar150.dts
@@ -96,26 +96,32 @@
                spi-max-frequency = <104000000>;
                reg = <0>;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x000000 0x040000>;
-                       read-only;
-               };
-
-               partition@1 {
-                       label = "u-boot-env";
-                       reg = <0x040000 0x010000>;
-               };
-
-               partition@2 {
-                       label = "firmware";
-                       reg = <0x050000 0xfa0000>;
-               };
-
-               art: partition@3 {
-                       label = "ART";
-                       reg = <0xff0000 0x010000>;
-                       read-only;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x000000 0x040000>;
+                               read-only;
+                       };
+
+                       partition@1 {
+                               label = "u-boot-env";
+                               reg = <0x040000 0x010000>;
+                       };
+
+                       partition@2 {
+                               label = "firmware";
+                               reg = <0x050000 0xfa0000>;
+                       };
+
+                       art: partition@3 {
+                               label = "ART";
+                               reg = <0xff0000 0x010000>;
+                               read-only;
+                       };
                };
        };
 };

diff --git a/target/linux/ath79/dts/ar9331_ew_dorin.dts b/target/linux/ath79/dts/ar9331_ew_dorin.dts
index 3c2a1b2147bba88c9847849d9bd8e4f104e21284..fd1859380773df19bddc961b403d13b8f700a922 100644 (file)
--- a/target/linux/ath79/dts/ar9331_ew_dorin.dts
+++ b/target/linux/ath79/dts/ar9331_ew_dorin.dts
@@ -77,26 +77,32 @@
                spi-max-frequency = <104000000>;
                reg = <0>;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x000000 0x040000>;
-                       read-only;
-               };
-
-               partition@1 {
-                       label = "u-boot-env";
-                       reg = <0x040000 0x010000>;
-               };
-
-               partition@2 {
-                       label = "firmware";
-                       reg = <0x050000 0xfa0000>;
-               };
-
-               art: partition@3 {
-                       label = "ART";
-                       reg = <0xff0000 0x010000>;
-                       read-only;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x000000 0x040000>;
+                               read-only;
+                       };
+
+                       partition@1 {
+                               label = "u-boot-env";
+                               reg = <0x040000 0x010000>;
+                       };
+
+                       partition@2 {
+                               label = "firmware";
+                               reg = <0x050000 0xfa0000>;
+                       };
+
+                       art: partition@3 {
+                               label = "ART";
+                               reg = <0xff0000 0x010000>;
+                               read-only;
+                       };
                };
        };
 };

diff --git a/target/linux/ath79/dts/qca9558_om5p_ac.dts b/target/linux/ath79/dts/qca9558_om5p_ac.dts
index 517bc17cd7f05df4cc8578124fb4a9444001fccc..974b1c61f0d501cf6dc9c5a04db21b899f8e1255 100644 (file)
--- a/target/linux/ath79/dts/qca9558_om5p_ac.dts
+++ b/target/linux/ath79/dts/qca9558_om5p_ac.dts
@@ -113,26 +113,32 @@
                reg = <0>;
                spi-max-frequency = <25000000>;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x000000 0x040000>;
-                       read-only;
-               };
-
-               partition@1 {
-                       label = "u-boot-env";
-                       reg = <0x040000 0x010000>;
-               };
-
-               partition@2 {
-                       label = "firmware";
-                       reg = <0x850000 0x7a0000>;
-               };
-
-               partition@3 {
-                       label = "ART";
-                       reg = <0xff0000 0x010000>;
-                       read-only;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x000000 0x040000>;
+                               read-only;
+                       };
+
+                       partition@1 {
+                               label = "u-boot-env";
+                               reg = <0x040000 0x010000>;
+                       };
+
+                       partition@2 {
+                               label = "firmware";
+                               reg = <0x850000 0x7a0000>;
+                       };
+
+                       partition@3 {
+                               label = "ART";
+                               reg = <0xff0000 0x010000>;
+                               read-only;
+                       };
                };
        };
 };