ramips: dts: Unify naming of gpio-keys nodes

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / DWR-921-C1.dts

diff --git a/target/linux/ramips/dts/DWR-921-C1.dts b/target/linux/ramips/dts/DWR-921-C1.dts
index dbcbc17d843ffc683f5896c0562ed0f38fc9c733..330754b22a2cf77e9a8414bbdb833a6be9122484 100644 (file)
--- a/target/linux/ramips/dts/DWR-921-C1.dts
+++ b/target/linux/ramips/dts/DWR-921-C1.dts
@@ -9,10 +9,13 @@
        compatible = "dlink,dwr-921-c1", "ralink,mt7620n-soc";
        model = "D-Link DWR-921 C1";
 
-       gpio-keys-polled {
-       compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
+       aliases {
+               led-boot = &led_sstrenghg;
+               led-failsafe = &led_sstrenghg;
+       };
+
+       keys {
+               compatible = "gpio-keys-polled";
                poll-interval = <20>;
 
                wps {
@@ -41,7 +44,7 @@
                        gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
                };
 
-               sstrengthg {
+               led_sstrenghg: sstrengthg {
                        label = "dwr-921-c1:green:sigstrength";
                        gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
                };
@@ -94,28 +97,33 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
 
-               partition@0 {
-                       label = "jboot";
-                       reg = <0x0 0x10000>;
-                       read-only;
-               };
-
-               partition@10000 {
-                       label = "firmware";
-                       reg = <0x10000 0xfe0000>;
-               };
-
-               config: partition@ff0000 {
-                       label = "config";
-                       reg = <0xff0000 0x10000>;
-                       read-only;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "jboot";
+                               reg = <0x0 0x10000>;
+                               read-only;
+                       };
+
+                       partition@10000 {
+                               compatible = "amit,jimage";
+                               label = "firmware";
+                               reg = <0x10000 0xfe0000>;
+                       };
+
+                       config: partition@ff0000 {
+                               label = "config";
+                               reg = <0xff0000 0x10000>;
+                               read-only;
+                       };
                };
        };
 };