lantiq: dts: move partitions into partition node

Signed-off-by: Mathias Kresin <dev@kresin.me>

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NOR.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NOR.dts
index ad53bf96e99118261c9fca5f4674bb166fbf09b7..3c1d257dbafaf6a5eb402e6070e36b493967d47b 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NOR.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NOR.dts
@@ -17,22 +17,26 @@
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0x0 0x4000000>;
-               #address-cells = <1>;
-               #size-cells = <1>;
 
-               partition@0 {
-                       label = "uboot";
-                       reg = <0x00000 0x40000>;
-               };
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-               partition@10000 {
-                       label = "uboot_env";
-                       reg = <0x40000 0x40000>;
-               };
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x00000 0x40000>;
+                       };
+
+                       partition@10000 {
+                               label = "uboot_env";
+                               reg = <0x40000 0x40000>;
+                       };
 
-               partition@20000 {
-                       label = "linux";
-                       reg = <0x80000 0x3d0000>;
+                       partition@20000 {
+                               label = "linux";
+                               reg = <0x80000 0x3d0000>;
+                       };
                };
        };
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi
index aba0d2c81e747733d4f8b2d81d11525b3556600d..7197537490fb3fb45278920bad05ddb100567a78 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi
@@ -261,28 +261,32 @@
        pinctrl-0 = <&pins_spi_default>;
 
        m25p80@4 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <4>;
                spi-max-frequency = <1000000>;
 
-               urlader: partition@0 {
-                       reg = <0x0 0x20000>;
-                       label = "urlader";
-                       read-only;
-               };
-
-               partition@20000 {
-                       reg = <0x20000 0x10000>;
-                       label = "tffs (1)";
-                       read-only;
-               };
-
-               partition@30000 {
-                       reg = <0x30000 0x10000>;
-                       label = "tffs (2)";
-                       read-only;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       urlader: partition@0 {
+                               reg = <0x0 0x20000>;
+                               label = "urlader";
+                               read-only;
+                       };
+
+                       partition@20000 {
+                               reg = <0x20000 0x10000>;
+                               label = "tffs (1)";
+                               read-only;
+                       };
+
+                       partition@30000 {
+                               reg = <0x30000 0x10000>;
+                               label = "tffs (2)";
+                               read-only;
+                       };
                };
        };
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts b/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts
index 77e105d6a736aae857f4ae7bc2bd626c02449384..65f2e82c65c34712979542fd36e29c6018546c4a 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts
@@ -264,49 +264,52 @@
        pinctrl-0 = <&pins_spi_default>;
 
        m25p80@4 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <4>;
                spi-max-frequency = <20000000>;
 
-               partition@0 {
-                       reg = <0x0 0x10000>;
-                       label = "u-boot";
-                       read-only;
-               };
-
-               partition@10000 {
-                       reg = <0x10000 0x10000>;
-                       label = "gphyfirmware";
-                       read-only;
-               };
-
-               partition@20000 {
-                       reg = <0x20000 0x80000>;
-                       label = "dsl_fw";
-               };
-
-               partition@de0000 {
-                       reg = <0xa0000 0xf40000>;
-                       label = "firmware";
-               };
-
-               partition@fe0000 {
-                       reg = <0xfe0000 0x10000>;
-                       label = "sysconfig";
-                       read-only;
-               };
-
-               partition@ff0000 {
-                       reg = <0xff0000 0x2000>;
-                       label = "ubootconfig";
-               };
-
-               partition@ff3000 {
-                       reg = <0xff3000 0x2000>;
-                       label = "board_config";
-                       read-only;
+               partitions {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               reg = <0x0 0x10000>;
+                               label = "u-boot";
+                               read-only;
+                       };
+
+                       partition@10000 {
+                               reg = <0x10000 0x10000>;
+                               label = "gphyfirmware";
+                               read-only;
+                       };
+
+                       partition@20000 {
+                               reg = <0x20000 0x80000>;
+                               label = "dsl_fw";
+                       };
+
+                       partition@de0000 {
+                               reg = <0xa0000 0xf40000>;
+                               label = "firmware";
+                       };
+
+                       partition@fe0000 {
+                               reg = <0xfe0000 0x10000>;
+                               label = "sysconfig";
+                               read-only;
+                       };
+
+                       partition@ff0000 {
+                               reg = <0xff0000 0x2000>;
+                               label = "ubootconfig";
+                       };
+
+                       partition@ff3000 {
+                               reg = <0xff3000 0x2000>;
+                               label = "board_config";
+                               read-only;
+                       };
                };
        };
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/falcon-sflash-16M.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/falcon-sflash-16M.dtsi
index d95acc21eff8e66f3bfe0a2e12a35e3bdfbe82aa..626b964507353cb9293c5f8975f92b15421ea157 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/falcon-sflash-16M.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/falcon-sflash-16M.dtsi
@@ -5,33 +5,37 @@
        compatible = "lantiq,sflash-falcon", "simple-bus";
 
        flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "spansion,s25fl129p0", "spansion,s25fl129p1";
                reg = <0 0>;
                linux,mtd-name = "sflash";
                spi-max-frequency = <80000000>;
                m25p,fast-read;
 
-               partition@0 {
-                       reg = <0x0 0x40000>;
-                       label = "uboot";
-                       read-only;
-               };
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-               partition@40000 {
-                       reg = <0x40000 0x80000>;
-                       label = "uboot_env";
-               };
+                       partition@0 {
+                               reg = <0x0 0x40000>;
+                               label = "uboot";
+                               read-only;
+                       };
 
-               partition@C0000 {
-                       reg = <0xC0000 0x740000>;
-                       label = "image0";
-               };
+                       partition@40000 {
+                               reg = <0x40000 0x80000>;
+                               label = "uboot_env";
+                       };
+
+                       partition@C0000 {
+                               reg = <0xC0000 0x740000>;
+                               label = "image0";
+                       };
 
-               partition@800000 {
-                       reg = <0x800000 0x800000>;
-                       label = "image1";
+                       partition@800000 {
+                               reg = <0x800000 0x800000>;
+                               label = "image1";
+                       };
                };
        };
 };