ramips: dts: Unify naming of gpio-keys nodes

[openwrt/openwrt.git] / target / linux / ramips / dts / D105.dts

diff --git a/target/linux/ramips/dts/D105.dts b/target/linux/ramips/dts/D105.dts
index 56cb324e1381df6e0aa8c4af8dbd06bde8e8571b..b4f7aeb31fce69154065db6d78a39de0a47ab0e9 100644 (file)
--- a/target/linux/ramips/dts/D105.dts
+++ b/target/linux/ramips/dts/D105.dts
@@ -10,7 +10,10 @@
        model = "Huawei D105";
 
        aliases {
-               led-status = &led_power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        cfi@1f000000 {
@@ -18,30 +21,35 @@
                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 0x3b0000>;
+               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 0x3b0000>;
+                       };
                };
        };
 
@@ -56,10 +64,12 @@
                usb {
                        label = "d105:green:usb";
                        gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&otg_port1>;
+                       linux,default-trigger = "usbport";
                };
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <20>;