ramips: dts: Unify naming of gpio-led nodes

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / ki_rb.dts

diff --git a/target/linux/ramips/dts/ki_rb.dts b/target/linux/ramips/dts/ki_rb.dts
index 8b27063a46becad24c6415e2bcba68cdd8a4fe00..5d487868b368102b6a37b81eccd4e60325d648cb 100644 (file)
--- a/target/linux/ramips/dts/ki_rb.dts
+++ b/target/linux/ramips/dts/ki_rb.dts
@@ -9,6 +9,13 @@
        compatible = "zyxel,keenetic-extra-ii", "mediatek,mt7628an-soc";
        model = "ZyXEL Keenetic Extra II";
 
+       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,8 @@
                bootargs = "console=ttyS0,57600n8";
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                reset {
@@ -43,10 +48,10 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
-               power {
+               led_power: power {
                        label = "keenetic-extra-ii:green:power";
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
@@ -65,6 +70,8 @@
                usb {
                        label = "keenetic-extra-ii:green:usb";
                        gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&ohci_port1>, <&ehci_port1>;
+                       linux,default-trigger = "usbport";
                };
        };
 
@@ -84,82 +91,87 @@
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
                m25p,chunked-io = <32>;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x0 0x30000>;
-                       read-only;
-               };
-
-               partition@30000 {
-                       label = "u-config";
-                       reg = <0x30000 0x10000>;
-                       read-only;
-               };
-
-               factory: partition@40000 {
-                       label = "rf-eeprom";
-                       reg = <0x40000 0x10000>;
-                       read-only;
-               };
-
-               partition@50000 {
-                       label = "firmware";
-                       reg = <0x50000 0xe90000>;
-               };
-
-               partition@ee0000 {
-                       label = "config_1";
-                       reg = <0xee0000 0x10000>;
-                       read-only;
-               };
-
-               partition@ef0000 {
-                       label = "storage";
-                       reg = <0xef0000 0x100000>;
-                       read-only;
-               };
-
-               partition@ff0000 {
-                       label = "dump";
-                       reg = <0xff0000 0x10000>;
-                       read-only;
-               };
-
-               partition@1000000 {
-                       label = "u-state";
-                       reg = <0x1000000 0x30000>;
-                       read-only;
-               };
-
-               partition@1030000 {
-                       label = "u-config_res";
-                       reg = <0x1030000 0x10000>;
-                       read-only;
-               };
-
-               partition@1040000 {
-                       label = "rf-eeprom_res";
-                       reg = <0x1040000 0x10000>;
-                       read-only;
-               };
-
-               partition@1050000 {
-                       label = "firmware_2";
-                       reg = <0x1050000 0xe90000>;
-                       read-only;
-               };
-
-               partition@1ee0000 {
-                       label = "config_2";
-                       reg = <0x1ee0000 0x10000>;
-                       read-only;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x30000>;
+                               read-only;
+                       };
+
+                       partition@30000 {
+                               label = "u-config";
+                               reg = <0x30000 0x10000>;
+                               read-only;
+                       };
+
+                       factory: partition@40000 {
+                               label = "rf-eeprom";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@50000 {
+                               compatible = "denx,uimage";
+                               label = "firmware";
+                               reg = <0x50000 0xe90000>;
+                       };
+
+                       partition@ee0000 {
+                               label = "config_1";
+                               reg = <0xee0000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@ef0000 {
+                               label = "storage";
+                               reg = <0xef0000 0x100000>;
+                               read-only;
+                       };
+
+                       partition@ff0000 {
+                               label = "dump";
+                               reg = <0xff0000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@1000000 {
+                               label = "u-state";
+                               reg = <0x1000000 0x30000>;
+                               read-only;
+                       };
+
+                       partition@1030000 {
+                               label = "u-config_res";
+                               reg = <0x1030000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@1040000 {
+                               label = "rf-eeprom_res";
+                               reg = <0x1040000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@1050000 {
+                               label = "firmware_2";
+                               reg = <0x1050000 0xe90000>;
+                               read-only;
+                       };
+
+                       partition@1ee0000 {
+                               label = "config_2";
+                               reg = <0x1ee0000 0x10000>;
+                               read-only;
+                       };
                };
        };
 };
@@ -184,15 +196,14 @@
 
 &pcie {
        status = "okay";
+};
 
-       pcie-bridge {
-               mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
-                       mediatek,mtd-eeprom = <&factory 0x8000>;
-                       ieee80211-freq-limit = <5000000 6000000>;
-                       mtd-mac-address = <&factory 0x8004>;
-               };
+&pcie0 {
+       mt76@0,0 {
+               reg = <0x0000 0 0 0 0>;
+               mediatek,mtd-eeprom = <&factory 0x8000>;
+               ieee80211-freq-limit = <5000000 6000000>;
+               mtd-mac-address = <&factory 0x8004>;
        };
 };