ramips: dts: Unify naming of gpio-keys nodes

[openwrt/openwrt.git] / target / linux / ramips / dts / RBM11G.dts

diff --git a/target/linux/ramips/dts/RBM11G.dts b/target/linux/ramips/dts/RBM11G.dts
index c26c68350fe8417c5dace16b3471bfb206d27250..f7832bbce25f0cdb326b5edc422d4460f9ded5a1 100644 (file)
--- a/target/linux/ramips/dts/RBM11G.dts
+++ b/target/linux/ramips/dts/RBM11G.dts
@@ -10,7 +10,10 @@
        model = "MikroTik RouterBOARD M11G";
 
        aliases {
-               led-status = &led_usr;
+               led-boot = &led_usr;
+               led-failsafe = &led_usr;
+               led-running = &led_usr;
+               led-upgrade = &led_usr;
        };
 
        memory@0 {
@@ -56,10 +59,8 @@
                };
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
                res {
                        label = "reset";
@@ -86,33 +87,65 @@
        status = "okay";
 
        w25q128@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
+               // XXX empiric value to obtain actual 10MHz SCK at the chip
                spi-max-frequency = <3125000>;
 
-               partition@0 {
-                       label = "routerboot";
-                       reg = <0x000000 0x00F000>;
-                       read-only;
-               };
-
-               factory: partition@f000 {
-                       label = "factory";
-                       reg = <0x00F000 0x031000>;
-                       read-only;
-               };
-
-               partition@40000 {
-                       label = "firmware";
-                       reg = <0x040000 0xFC0000>;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "RouterBoot";
+                               reg = <0x0 0x40000>;
+                               read-only;
+                               compatible = "fixed-partitions";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               partition@0 {
+                                       label = "bootloader1";
+                                       reg = <0x0 0xf000>;
+                                       read-only;
+                               };
+
+                               hard_config: partition@f000 {
+                                       label = "hard_config";
+                                       reg = <0xf000 0x1000>;
+                                       read-only;
+                               };
+
+                               partition@10000 {
+                                       label = "bootloader2";
+                                       reg = <0x10000 0xf000>;
+                                       read-only;
+                               };
+
+                               partition@20000 {
+                                       label = "soft_config";
+                                       reg = <0x20000 0x1000>;
+                               };
+
+                               partition@30000 {
+                                       label = "bios";
+                                       reg = <0x30000 0x1000>;
+                                       read-only;
+                               };
+                       };
+
+                       partition@40000 {
+                               compatible = "mikrotik,minor";
+                               label = "firmware";
+                               reg = <0x040000 0xFC0000>;
+                       };
                };
        };
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x0010>;
+       mtd-mac-address = <&hard_config 0x0010>;
        mtd-mac-address-increment = <1>;
 };