ramips: dts: Unify naming of gpio-led nodes

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

diff --git a/target/linux/ramips/dts/FONERA20N.dts b/target/linux/ramips/dts/FONERA20N.dts
index bc7474ccfb204e3c7f3fa8adaf97c80b6e7ec701..83ce17317497b3b89e1a4d28845a692535bd7c53 100644 (file)
--- a/target/linux/ramips/dts/FONERA20N.dts
+++ b/target/linux/ramips/dts/FONERA20N.dts
@@ -9,39 +9,51 @@
        compatible = "fon,fonera20n", "ralink,rt3052-soc";
        model = "La Fonera 2.0N";
 
+       aliases {
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
+       };
+
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                bank-width = <2>;
                device-width = <2>;
-               #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 {
-                       label = "firmware";
-                       reg = <0x50000 0x7b0000>;
+               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 0x7b0000>;
+                       };
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                wifi {
@@ -49,7 +61,7 @@
                        gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
                };
 
-               power {
+               led_power: power {
                        label = "fonera20n:green:power";
                        gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
@@ -57,13 +69,13 @@
                usb {
                        label = "fonera20n:orange:usb";
                        gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&otg_port1>;
+                       linux,default-trigger = "usbport";
                };
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                reset {
@@ -95,34 +107,42 @@
 };
 
 &esw {
+       #address-cells = <1>;
+       #size-cells = <0>;
+
        mediatek,portmap = <0x2f>;
 
        port@0 {
                compatible = "swconfig,port";
+               reg = <0>;
                swconfig,segment = "lan";
                swconfig,portmap = <0 4>;
        };
 
        port@1 {
                compatible = "swconfig,port";
+               reg = <1>;
                swconfig,segment = "lan";
                swconfig,portmap = <1 3>;
        };
 
        port@2 {
                compatible = "swconfig,port";
+               reg = <2>;
                swconfig,segment = "lan";
                swconfig,portmap = <2 2>;
        };
 
        port@3 {
                compatible = "swconfig,port";
+               reg = <3>;
                swconfig,segment = "lan";
                swconfig,portmap = <3 1>;
        };
 
        port@4 {
                compatible = "swconfig,port";
+               reg = <4>;
                swconfig,segment = "wan";
                swconfig,portmap = <4 0>;
        };