ramips: dts: Unify naming of gpio-led nodes

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

diff --git a/target/linux/ramips/dts/R6220.dts b/target/linux/ramips/dts/R6220.dts
index 2bbb0db3b291b70f152beaba5cffbb8cefa6647e..335351c8259ea5261131ac29c32b35438cdc9292 100644 (file)
--- a/target/linux/ramips/dts/R6220.dts
+++ b/target/linux/ramips/dts/R6220.dts
@@ -9,6 +9,13 @@
        compatible = "netgear,r6220", "mediatek,mt7621-soc";
        model = "Netgear R6220";
 
+       aliases {
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
+       };
+
        memory@0 {
                device_type = "memory";
                reg = <0x0 0x8000000>;
@@ -18,10 +25,10 @@
                bootargs = "console=ttyS0,57600";
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
-               power {
+               led_power: power {
                        label = "r6220:green:power";
                        gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
                };
@@ -29,6 +36,8 @@
                usb {
                        label = "r6220:green:usb";
                        gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
+                       linux,default-trigger = "usbport";
                };
 
                internet {
@@ -47,10 +56,8 @@
                };
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                wps {
@@ -79,7 +86,7 @@
                usbpower {
                        gpio-export,name = "usbpower";
                        gpio-export,output = <1>;
-                       gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
                };
        };
 };
@@ -87,60 +94,64 @@
 &nand {
        status = "okay";
 
-       partition@0 {
-               label = "u-boot";
-               reg = <0x0 0x100000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       partition@100000 {
-               label = "SC PID";
-               reg = <0x100000 0x100000>;
-               read-only;
-       };
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x100000>;
+                       read-only;
+               };
 
-       partition@200000 {
-               label = "kernel";
-               reg = <0x200000 0x400000>;
-       };
+               partition@100000 {
+                       label = "SC PID";
+                       reg = <0x100000 0x100000>;
+                       read-only;
+               };
 
-       partition@600000 {
-               label = "ubi";
-               reg = <0x600000 0x1c00000>;
-       };
+               partition@200000 {
+                       label = "kernel";
+                       reg = <0x200000 0x400000>;
+               };
 
-       factory: partition@2e00000 {
-               label = "factory";
-               reg = <0x2e00000 0x100000>;
-               read-only;
-       };
+               partition@600000 {
+                       label = "ubi";
+                       reg = <0x600000 0x1c00000>;
+               };
+
+               factory: partition@2e00000 {
+                       label = "factory";
+                       reg = <0x2e00000 0x100000>;
+                       read-only;
+               };
 
-       partition@4200000 {
-               label = "reserved";
-               reg = <0x4200000 0x3c00000>;
-               read-only;
+               partition@4200000 {
+                       label = "reserved";
+                       reg = <0x4200000 0x3c00000>;
+                       read-only;
+               };
        };
 };
 
 &pcie {
        status = "okay";
+};
 
-       pcie0 {
-               mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
-                       mediatek,mtd-eeprom = <&factory 0x8000>;
-                       ieee80211-freq-limit = <5000000 6000000>;
-               };
+&pcie0 {
+       mt76@0,0 {
+               reg = <0x0000 0 0 0 0>;
+               mediatek,mtd-eeprom = <&factory 0x8000>;
+               ieee80211-freq-limit = <5000000 6000000>;
        };
+};
 
-       pcie1 {
-               mt76@1,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
-                       mediatek,mtd-eeprom = <&factory 0x0000>;
-                       ieee80211-freq-limit = <2400000 2500000>;
-               };
+&pcie1 {
+       mt76@0,0 {
+               reg = <0x0000 0 0 0 0>;
+               mediatek,mtd-eeprom = <&factory 0x0000>;
+               ieee80211-freq-limit = <2400000 2500000>;
        };
 };