ramips: dts: Unify naming of gpio-led nodes

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / WRC-1167GHBK2-S.dts

diff --git a/target/linux/ramips/dts/WRC-1167GHBK2-S.dts b/target/linux/ramips/dts/WRC-1167GHBK2-S.dts
index 73e1d45c1fe0dd312f331579eba0b0e2f2271cfd..7758cefdc33ddb0b5b84a58da189d11591b6fd8d 100644 (file)
--- a/target/linux/ramips/dts/WRC-1167GHBK2-S.dts
+++ b/target/linux/ramips/dts/WRC-1167GHBK2-S.dts
@@ -10,7 +10,10 @@
        model = "ELECOM WRC-1167GHBK2-S";
 
        aliases {
-               led-status = &led_power_green;
+               led-boot = &led_power_green;
+               led-failsafe = &led_power_green;
+               led-running = &led_power_green;
+               led-upgrade = &led_power_green;
        };
 
        memory@0 {
@@ -22,7 +25,7 @@
                bootargs = "console=ttyS0,57600";
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                wlan2g {
@@ -56,7 +59,7 @@
                };
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <20>;
 
@@ -82,46 +85,51 @@
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
                m25p,chunked-io = <32>;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x0 0x30000>;
-                       read-only;
-               };
-
-               partition@30000 {
-                       label = "u-boot-env";
-                       reg = <0x30000 0x10000>;
-                       read-only;
-               };
-
-               factory: partition@40000 {
-                       label = "factory";
-                       reg = <0x40000 0x10000>;
-                       read-only;
-               };
-
-               partition@50000 {
-                       label = "firmware";
-                       reg = <0x50000 0xf20000>;
-               };
-
-               partition@f70000 {
-                       label = "user_data";
-                       reg = <0xf70000 0x80000>;
-                       read-only;
-               };
-
-               partition@ff0000 {
-                       label = "NVRAM";
-                       reg = <0xff0000 0x10000>;
-                       read-only;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x30000>;
+                               read-only;
+                       };
+
+                       partition@30000 {
+                               label = "u-boot-env";
+                               reg = <0x30000 0x10000>;
+                               read-only;
+                       };
+
+                       factory: partition@40000 {
+                               label = "factory";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@50000 {
+                               compatible = "denx,uimage";
+                               label = "firmware";
+                               reg = <0x50000 0xf20000>;
+                       };
+
+                       partition@f70000 {
+                               label = "user_data";
+                               reg = <0xf70000 0x80000>;
+                               read-only;
+                       };
+
+                       partition@ff0000 {
+                               label = "NVRAM";
+                               reg = <0xff0000 0x10000>;
+                               read-only;
+                       };
                };
        };
 };
@@ -137,8 +145,10 @@
 
 &pcie {
        status = "okay";
-       // WRC-1167GHBK2-S has MT7615D for 2.4/5 GHz wifi,
-       // but it's not supported in OpenWrt.
+       /*
+        * WRC-1167GHBK2-S has MT7615D for 2.4/5 GHz wifi,
+        * but it's not supported in OpenWrt.
+        */
 };
 
 &xhci {