ath79: use the new DT fixed partitions syntax
authorRafał Miłecki <rafal@milecki.pl>
Mon, 7 May 2018 08:35:51 +0000 (10:35 +0200)
committerJohn Crispin <john@phrozen.org>
Mon, 7 May 2018 10:57:47 +0000 (12:57 +0200)
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>
target/linux/ath79/dts/ar7161_netgear_wndr3800.dts
target/linux/ath79/dts/ar7241_ubnt-unifi.dts
target/linux/ath79/dts/ar7241_ubnt-xm.dtsi
target/linux/ath79/dts/ar9132_tl_wr1043nd_v1.dts
target/linux/ath79/dts/ar9330_gl_ar150.dts
target/linux/ath79/dts/ar9331_ew_dorin.dts
target/linux/ath79/dts/qca9558_om5p_ac.dts

index ba6e9ae..a175fd7 100644 (file)
                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;
+                       };
                };
        };
 };
index aaafb08..1fa2d82 100644 (file)
                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;
+                       };
                };
        };
 };
index cd7da20..ac0a79d 100644 (file)
                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;
+                       };
                };
        };
 };
index 0999412..0ad865b 100644 (file)
                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;
+                       };
                };
        };
 };
index a41799f..97beab1 100644 (file)
                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;
+                       };
                };
        };
 };
index 3c2a1b2..fd18593 100644 (file)
                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;
+                       };
                };
        };
 };
index 517bc17..974b1c6 100644 (file)
                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;
+                       };
                };
        };
 };