ramips: dts: Unify naming of gpio-keys nodes

[openwrt/staging/dedeckeh.git] / target / linux / ramips / dts / WZR-AGL300NH.dts

diff --git a/target/linux/ramips/dts/WZR-AGL300NH.dts b/target/linux/ramips/dts/WZR-AGL300NH.dts
index ff7a5ecf9416ed6566e0a3d05c6c3809b11579df..8f7dc9bec1fb74bffcf1df1b0cb899bad44a2f93 100644 (file)
--- a/target/linux/ramips/dts/WZR-AGL300NH.dts
+++ b/target/linux/ramips/dts/WZR-AGL300NH.dts
@@ -11,8 +11,11 @@
        compatible = "buffalo,wzr-agl300nh", "ralink,rt2880-soc";
        model = "Buffalo WZR-AGL300NH";
 
-       pci@440000 {
-               status = "ok";
+       aliases {
+               led-boot = &led_router;
+               led-failsafe = &led_router;
+               led-running = &led_router;
+               led-upgrade = &led_router;
        };
 
        cfi@1f000000 {
@@ -20,30 +23,35 @@
                reg = <0x1f000000 0x800000>;
                bank-width = <2>;
                device-width = <2>;
-               #address-cells = <1>;
-               #size-cells = <1>;
 
-               partition@0 {
-                       label = "uboot";
-                       reg = <0x0 0x30000>;
-                       read-only;
-               };
-
-               partition@30000 {
-                       label = "uboot-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 = "uboot";
+                               reg = <0x0 0x30000>;
+                               read-only;
+                       };
+
+                       partition@30000 {
+                               label = "uboot-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>;
+                       };
                };
        };
 
@@ -53,10 +61,8 @@
                gpio-sck = <&gpio0 2 GPIO_ACTIVE_HIGH>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <100>;
 
                wps {
@@ -81,7 +87,7 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               router {
+               led_router: router {
                        label = "wzr-agl300nh:green:router";
                        gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
                };
@@ -134,6 +140,10 @@
        };
 };
 
+&pci {
+       status = "okay";
+};
+
 &wmac {
        ralink,mtd-eeprom = <&factory 0>;
 };