ramips: move partitions into partition table node

[openwrt/staging/dedeckeh.git] / target / linux / ramips / dts / UBNT-ER-e50.dtsi

diff --git a/target/linux/ramips/dts/UBNT-ER-e50.dtsi b/target/linux/ramips/dts/UBNT-ER-e50.dtsi
index 1bf889e1412e9157b43e5213d56c21f9344a73d4..2a983d08ff384a92c54c30386d7aa85be5445d86 100644 (file)
--- a/target/linux/ramips/dts/UBNT-ER-e50.dtsi
+++ b/target/linux/ramips/dts/UBNT-ER-e50.dtsi
@@ -34,36 +34,42 @@
 &nand {
        status = "okay";
 
-       partition@0 {
-               label = "u-boot";
-               reg = <0x0 0x80000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       partition@80000 {
-               label = "u-boot-env";
-               reg = <0x80000 0x60000>;
-               read-only;
-       };
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x80000>;
+                       read-only;
+               };
 
-       factory: partition@e0000 {
-               label = "factory";
-               reg = <0xe0000 0x60000>;
-       };
+               partition@80000 {
+                       label = "u-boot-env";
+                       reg = <0x80000 0x60000>;
+                       read-only;
+               };
 
-       partition@140000 {
-               label = "kernel1";
-               reg = <0x140000 0x300000>;
-       };
+               factory: partition@e0000 {
+                       label = "factory";
+                       reg = <0xe0000 0x60000>;
+               };
 
-       partition@440000 {
-               label = "kernel2";
-               reg = <0x440000 0x300000>;
-       };
+               partition@140000 {
+                       label = "kernel1";
+                       reg = <0x140000 0x300000>;
+               };
 
-       partition@740000 {
-               label = "ubi";
-               reg = <0x740000 0xf7c0000>;
+               partition@440000 {
+                       label = "kernel2";
+                       reg = <0x440000 0x300000>;
+               };
+
+               partition@740000 {
+                       label = "ubi";
+                       reg = <0x740000 0xf7c0000>;
+               };
        };
 };
 
@@ -86,17 +92,21 @@
        status = "disabled";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <1>;
                spi-max-frequency = <10000000>;
                m25p,chunked-io = <32>;
 
-               partition@0 {
-                       label = "spi";
-                       reg = <0x0 0x200000>;
-                       read-only;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "spi";
+                               reg = <0x0 0x200000>;
+                               read-only;
+                       };
                };
        };
 };