ramips: dts: Unify naming of gpio-led nodes

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / WF-2881.dts

diff --git a/target/linux/ramips/dts/WF-2881.dts b/target/linux/ramips/dts/WF-2881.dts
index 1197da76213a12b3e0c9a0679e7522b5e2f26baa..bc9d6d72295c42d3403491ae47ce0ccf41eda102 100644 (file)
--- a/target/linux/ramips/dts/WF-2881.dts
+++ b/target/linux/ramips/dts/WF-2881.dts
@@ -9,6 +9,13 @@
        compatible = "netis,wf-2881", "mediatek,mt7621-soc";
        model = "NETIS WF-2881";
 
+       aliases {
+               led-boot = &led_wps;
+               led-failsafe = &led_wps;
+               led-running = &led_wps;
+               led-upgrade = &led_wps;
+       };
+
        memory@0 {
                device_type = "memory";
                reg = <0x0 0x8000000>;
@@ -18,24 +25,24 @@
                bootargs = "console=ttyS0,57600";
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                usb {
                        label = "wf-2881:green:usb";
                        gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
+                       linux,default-trigger = "usbport";
                };
 
-               wps {
+               led_wps: wps {
                        label = "wf-2881:green:wps";
                        gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
                };
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                reset {
@@ -49,51 +56,60 @@
 &nand {
        status = "okay";
 
-       partition@0 {
-               label = "u-boot";
-               reg = <0x0 0x30000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       partition@30000 {
-               label = "u-boot-env";
-               reg = <0x30000 0x1000>;
-               read-only;
-       };
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
 
-       partition@80000 {
-               label = "config";
-               reg = <0x80000 0x80000>;
-               read-only;
-       };
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x1000>;
+                       read-only;
+               };
 
-       factory: partition@100000 {
-               label = "factory";
-               reg = <0x100000 0x40000>;
-               read-only;
-       };
+               partition@80000 {
+                       label = "config";
+                       reg = <0x80000 0x80000>;
+                       read-only;
+               };
 
-       partition@140000 {
-               label = "firmware";
-               reg = <0x140000 0x7E40000>;
+               factory: partition@100000 {
+                       label = "factory";
+                       reg = <0x100000 0x40000>;
+                       read-only;
+               };
+
+               partition@140000 {
+                       compatible = "denx,uimage";
+                       label = "firmware";
+                       reg = <0x140000 0x7E40000>;
+               };
        };
 };
 
 &pcie {
        status = "okay";
+};
 
-       pcie0 {
-               mt76@0,0 {
-                       mediatek,mtd-eeprom = <&factory 0x8000>;
-                       ieee80211-freq-limit = <5000000 6000000>;
-               };
+&pcie0 {
+       mt76@0,0 {
+               reg = <0x0000 0 0 0 0>;
+               mediatek,mtd-eeprom = <&factory 0x8000>;
+               ieee80211-freq-limit = <5000000 6000000>;
        };
+};
 
-       pcie1 {
-               mt76@1,0 {
-                       mediatek,mtd-eeprom = <&factory 0x0000>;
-                       ieee80211-freq-limit = <2400000 2500000>;
-               };
+&pcie1 {
+       mt76@0,0 {
+               reg = <0x0000 0 0 0 0>;
+               mediatek,mtd-eeprom = <&factory 0x0000>;
+               ieee80211-freq-limit = <2400000 2500000>;
        };
 };