ramips: move partitions into partition table node

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / RBM33G.dts

diff --git a/target/linux/ramips/dts/RBM33G.dts b/target/linux/ramips/dts/RBM33G.dts
index ed2cb841dd68ee05b716d947ec2d06ed137a1153..65560ab821e9ee618dfda3ad40603f261aa91ac0 100644 (file)
--- a/target/linux/ramips/dts/RBM33G.dts
+++ b/target/linux/ramips/dts/RBM33G.dts
@@ -7,7 +7,11 @@
 
 / {
        compatible = "mikrotik,rbm33g", "mediatek,mt7621-soc";
-       model = "MikroTik RBM33G";
+       model = "MikroTik RouterBOARD M33G";
+
+       aliases {
+               led-status = &led_usr;
+       };
 
        memory@0 {
                device_type = "memory";
@@ -21,7 +25,7 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               usr {
+               led_usr: usr {
                        label = "rbm33g:green:usr";
                        gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
                };
@@ -30,8 +34,6 @@
 
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                res {
@@ -94,36 +96,43 @@
        status = "okay";
 
        w25q40@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <3125000>;
 
-               partition@0 {
-                       label = "routerboot";
-                       reg = <0x0 0xf000>;
-                       read-only;
-               };
-
-               factory: partition@f000 {
-                       label = "factory";
-                       reg = <0xf000 0x71000>;
-                       read-only;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "routerboot";
+                               reg = <0x0 0xf000>;
+                               read-only;
+                       };
+
+                       factory: partition@f000 {
+                               label = "factory";
+                               reg = <0xf000 0x71000>;
+                               read-only;
+                       };
                };
-
        };
 
-       w25q128@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
+       w25q128@1 {
                compatible = "jedec,spi-nor";
                reg = <1>;
                spi-max-frequency = <3125000>;
 
-               partition@40000 {
-                       label = "firmware";
-                       reg = <0x040000 0xFC0000>;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@40000 {
+                               label = "firmware";
+                               reg = <0x040000 0xFC0000>;
+                       };
                };
        };
 };