ramips: dts: Unify naming of gpio-led nodes

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

diff --git a/target/linux/ramips/dts/MPRA2.dts b/target/linux/ramips/dts/MPRA2.dts
index df33edadd3cba52f843e05115e5bbe669e0c001b..fedb5b061ee2e47f9b350044cf50fbbb23a13ff2 100644 (file)
--- a/target/linux/ramips/dts/MPRA2.dts
+++ b/target/linux/ramips/dts/MPRA2.dts
@@ -2,34 +2,42 @@
 
 #include "rt5350.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
 / {
-       compatible = "MPRA2", "ralink,rt5350-soc";
+       compatible = "hame,mpr-a2", "ralink,rt5350-soc";
        model = "HAME MPR-A2";
 
-       gpio-leds {
+       aliases {
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
+       };
+
+       leds {
                compatible = "gpio-leds";
 
-               system {
+               led_system: system {
                        label = "mpr-a2:blue:system";
-                       gpios = <&gpio0 20 1>;
+                       gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
                };
 
                power {
                        label = "mpr-a2:red:power";
-                       gpios = <&gpio0 17 1>;
+                       gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
                };
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                wps {
                        label = "reset";
-                       gpios = <&gpio0 0 1>;
-                       linux,code = <0x198>;
+                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 
@@ -40,13 +48,13 @@
                usb {
                        gpio-export,name = "usb";
                        gpio-export,output = <1>;
-                       gpios = <&gpio0 7 0>;
+                       gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
                };
 
                root_hub {
                        gpio-export,name = "root_hub";
                        gpio-export,output = <1>;
-                       gpios = <&gpio0 12 0>;
+                       gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
                };
        };
 };
@@ -55,34 +63,38 @@
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80", "s25fl064k";
                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>;
+                       };
                };
        };
 };
@@ -90,7 +102,7 @@
 &pinctrl {
        state_default: pinctrl0 {
                gpio {
-                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,group = "i2c", "jtag", "uartf";
                        ralink,function = "gpio";
                };
        };
@@ -101,7 +113,8 @@
 };
 
 &esw {
-       mediatek,portmap = <0x2f>;
+       mediatek,portmap = <0x1>;
+       mediatek,portdisable = <0x3e>;
 };
 
 &wmac {