ramips: dts: Unify naming of gpio-keys nodes

[openwrt/staging/mkresin.git] / target / linux / ramips / dts / V11STFE.dts

diff --git a/target/linux/ramips/dts/V11STFE.dts b/target/linux/ramips/dts/V11STFE.dts
index ae306670cf804b834f27139d2762b1273b5d79ee..244403e05f3832827d2529d4c40d50109b8ca227 100644 (file)
--- a/target/linux/ramips/dts/V11STFE.dts
+++ b/target/linux/ramips/dts/V11STFE.dts
@@ -9,51 +9,51 @@
        compatible = "ralink,v11st-fe", "ralink,rt2880-soc";
        model = "Ralink V11ST-FE";
 
-       pci@440000 {
-               status = "okay";
-
-               host-bridge {
-                       pci-bridge@1 {
-                               status = "okay";
-                       };
-               };
+       aliases {
+               led-boot = &led_status;
+               led-failsafe = &led_status;
+               led-running = &led_status;
+               led-upgrade = &led_status;
        };
 
        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 0x003b0000>;
-                       label = "firmware";
+                       partition@50000 {
+                               compatible = "denx,uimage";
+                               reg = <0x00050000 0x003b0000>;
+                               label = "firmware";
+                       };
                };
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <100>;
 
                wps {
@@ -66,7 +66,7 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               status {
+               led_status: status {
                        label = "v11st-fe:green:status";
                        gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
                };
@@ -81,6 +81,10 @@
        status = "okay";
 };
 
+&pci {
+       status = "okay";
+};
+
 &wmac {
        ralink,mtd-eeprom = <&factory 0>;
 };