ramips: dts: Unify naming of gpio-led nodes

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / RT-N56U.dts

diff --git a/target/linux/ramips/dts/RT-N56U.dts b/target/linux/ramips/dts/RT-N56U.dts
index 417411db77d444916a15ec81d3a74432bdec3217..9c2a32a9888febf152fd28f3649f1e172caed991 100644 (file)
--- a/target/linux/ramips/dts/RT-N56U.dts
+++ b/target/linux/ramips/dts/RT-N56U.dts
@@ -9,34 +9,46 @@
        compatible = "asus,rt-n56u", "ralink,rt3883-soc";
        model = "Asus RT-N56U";
 
+       aliases {
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
+       };
+
        nor-flash@1c000000 {
                compatible = "cfi-flash";
                reg = <0x1c000000 0x800000>;
                bank-width = <2>;
-               #address-cells = <1>;
-               #size-cells = <1>;
 
-               partition@0 {
-                       reg = <0x0 0x0030000>;
-                       label = "u-boot";
-                       read-only;
-               };
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-               partition@30000 {
-                       reg = <0x00030000 0x00010000>;
-                       label = "u-boot-env";
-                       read-only;
-               };
+                       partition@0 {
+                               reg = <0x0 0x0030000>;
+                               label = "u-boot";
+                               read-only;
+                       };
 
-               factory: partition@40000 {
-                       reg = <0x00040000 0x00010000>;
-                       label = "factory";
-                       read-only;
-               };
+                       partition@30000 {
+                               reg = <0x00030000 0x00010000>;
+                               label = "u-boot-env";
+                               read-only;
+                       };
+
+                       factory: partition@40000 {
+                               reg = <0x00040000 0x00010000>;
+                               label = "factory";
+                               read-only;
+                       };
 
-               partition@50000 {
-                       reg = <0x00050000 0x007b0000>;
-                       label = "firmware";
+                       partition@50000 {
+                               compatible = "denx,uimage";
+                               reg = <0x00050000 0x007b0000>;
+                               label = "firmware";
+                       };
                };
        };
 
@@ -47,10 +59,8 @@
                realtek,extif1 = <1 0 1 1 1 1 1 1 2>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <100>;
 
                reset {
@@ -66,10 +76,10 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
-               power {
+               led_power: power {
                        label = "rt-n56u:blue:power";
                        gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
                };
@@ -114,26 +124,15 @@
 
 &pci {
        status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pci_pins>;
-
-       pci_pins: pci {
-               pci {
-                       ralink,group = "pci";
-                       ralink,function = "pci-fnc";
-               };
-       };
+};
 
-       host-bridge {
-               pci-bridge@1 {
-                       status = "okay";
+&pci1 {
+       status = "okay";
 
-                       wifi@1814,3091 {
-                               compatible = "pci1814,3091";
-                               reg = <0x10000 0 0 0 0>;
-                               ralink,mtd-eeprom = <&factory 0x8000>;
-                       };
-               };
+       wifi@0,0 {
+               compatible = "pci1814,3091";
+               reg = <0x10000 0 0 0 0>;
+               ralink,mtd-eeprom = <&factory 0x8000>;
        };
 };