ramips: dts: Unify naming of gpio-led nodes

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / ZBT-WA05.dts

diff --git a/target/linux/ramips/dts/ZBT-WA05.dts b/target/linux/ramips/dts/ZBT-WA05.dts
index b1586ae82f80c0c98be9db964a3da381ab321dd6..21b56dcae17ba1f11bc4c39361694bc82cdd2859 100644 (file)
--- a/target/linux/ramips/dts/ZBT-WA05.dts
+++ b/target/linux/ramips/dts/ZBT-WA05.dts
@@ -9,14 +9,21 @@
        compatible = "zbtlink,zbt-wa05", "ralink,mt7620n-soc";
        model = "Zbtlink ZBT-WA05";
 
+       aliases {
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
+       };
+
        chosen {
                bootargs = "console=ttyS0,115200";
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
-               power {
+               led_power: power {
                        label = "zbt-wa05:blue:power";
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
                };
@@ -24,6 +31,8 @@
                usb {
                        label = "zbt-wa05:blue:usb";
                        gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
+                       trigger-sources = <&ohci_port1>, <&ehci_port1>;
+                       linux,default-trigger = "usbport";
                };
 
                air {
@@ -32,10 +41,8 @@
                };
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                reset {
@@ -62,33 +69,38 @@
        status = "okay";
 
        en25q64@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
 
-               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 0x760000>;
+               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 0x760000>;
+                       };
                };
        };
 };