ramips: dts: Unify naming of gpio-led nodes

[openwrt/staging/jogo.git] / target / linux / ramips / dts / MIWIFI-MINI.dts

diff --git a/target/linux/ramips/dts/MIWIFI-MINI.dts b/target/linux/ramips/dts/MIWIFI-MINI.dts
index 0cd511c4fae5c952b2d0ab5c5898841e55377013..e8ff02f2abc99dec0c0ad7a761b7448fd5ac19fd 100644 (file)
--- a/target/linux/ramips/dts/MIWIFI-MINI.dts
+++ b/target/linux/ramips/dts/MIWIFI-MINI.dts
@@ -2,44 +2,51 @@
 
 #include "mt7620a.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
 / {
        compatible = "xiaomi,miwifi-mini", "ralink,mt7620a-soc";
        model = "Xiaomi MiWiFi Mini";
 
+       aliases {
+               led-boot = &led_blue;
+               led-failsafe = &led_blue;
+               led-running = &led_blue;
+               led-upgrade = &led_blue;
+       };
+
        chosen {
                bootargs = "console=ttyS0,115200";
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
-               blue {
+               led_blue: blue {
                        label = "miwifi-mini:blue:status";
-                       gpios = <&gpio1 0 1>;
+                       gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
+                       default-state = "on";
                };
 
                yellow {
                        label = "miwifi-mini:yellow:status";
-                       gpios = <&gpio1 2 1>;
+                       gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
                };
 
                red {
                        label = "miwifi-mini:red:status";
-                       gpios = <&gpio1 5 1>;
+                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
                };
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 0>;
+                       gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -61,49 +68,53 @@
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80", "w25q128";
                spi-max-frequency = <10000000>;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x0 0x30000>;
-               };
-
-               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 0xf80000>;
-               };
-
-               partition@fd0000 {
-                       label = "crash";
-                       reg = <0xfd0000 0x10000>;
-               };
-
-               partition@fe0000 {
-                       label = "reserved";
-                       reg = <0xfe0000 0x10000>;
-                       read-only;
-               };
-
-               partition@ff0000 {
-                       label = "Bdata";
-                       reg = <0xff0000 0x10000>;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x30000>;
+                       };
+
+                       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 0xf80000>;
+                       };
+
+                       partition@fd0000 {
+                               label = "crash";
+                               reg = <0xfd0000 0x10000>;
+                       };
+
+                       partition@fe0000 {
+                               label = "reserved";
+                               reg = <0xfe0000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@ff0000 {
+                               label = "Bdata";
+                               reg = <0xff0000 0x10000>;
+                       };
                };
        };
 };
@@ -119,24 +130,25 @@
 &ethernet {
        pinctrl-names = "default";
        pinctrl-0 = <&ephy_pins>;
-       mtd-mac-address = <&factory 0x4>;
+       mtd-mac-address = <&factory 0x28>;
        mediatek,portmap = "llllw";
 };
 
 &wmac {
        ralink,mtd-eeprom = <&factory 0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pa_pins>;
 };
 
 &pcie {
        status = "okay";
+};
 
-       pcie-bridge {
-               mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
-                       mediatek,mtd-eeprom = <&factory 0x8000>;
-                       mediatek,2ghz = <0>;
-               };
+&pcie0 {
+       mt76@0,0 {
+               reg = <0x0000 0 0 0 0>;
+               mediatek,mtd-eeprom = <&factory 0x8000>;
+               ieee80211-freq-limit = <5000000 6000000>;
        };
 };
 
@@ -146,10 +158,5 @@
                        ralink,group = "i2c", "rgmii1";
                        ralink,function = "gpio";
                };
-
-               pa {
-                       ralink,group = "pa";
-                       ralink,function = "pa";
-               };
        };
 };