ramips: dts: Unify naming of gpio-led nodes

[openwrt/openwrt.git] / target / linux / ramips / dts / WHR-600D.dts

diff --git a/target/linux/ramips/dts/WHR-600D.dts b/target/linux/ramips/dts/WHR-600D.dts
index 611a23d9bbbca5b9fcae21a364c9ff489e262da2..f4b5661eac9475ca3b6efb0abca2c230f0c895d0 100644 (file)
--- a/target/linux/ramips/dts/WHR-600D.dts
+++ b/target/linux/ramips/dts/WHR-600D.dts
@@ -9,7 +9,14 @@
        compatible = "buffalo,whr-600d", "ralink,mt7620a-soc";
        model = "Buffalo WHR-600D";
 
-       gpio-leds {
+       aliases {
+               led-boot = &led_power_green;
+               led-failsafe = &led_power_green;
+               led-running = &led_power_green;
+               led-upgrade = &led_power_green;
+       };
+
+       leds {
                compatible = "gpio-leds";
 
                power {
@@ -22,7 +29,7 @@
                        gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
                };
 
-               power2 {
+               led_power_green: power2 {
                        label = "whr-600d:green:power";
                        gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
@@ -48,10 +55,8 @@
                };
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                reset {
@@ -90,33 +95,38 @@
        status = "okay";
 
        m25p80@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 0x7b0000>;
+               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 0x7b0000>;
+                       };
                };
        };
 };
@@ -147,12 +157,12 @@
 
 &pcie {
        status = "okay";
+};
 
-       pcie-bridge {
-               wifi@1814,5592 {
-                       compatible = "pci1814,5592";
-                       reg = <0x0000 0 0 0 0>;
-                       ralink,mtd-eeprom = <&factory 0x8000>;
-               };
+&pcie0 {
+       wifi@0,0 {
+               compatible = "pci1814,5592";
+               reg = <0x0000 0 0 0 0>;
+               ralink,mtd-eeprom = <&factory 0x8000>;
        };
 };