ramips: dts: Unify naming of gpio-led nodes

[openwrt/staging/dedeckeh.git] / target / linux / ramips / dts / GL-MT300A.dts

diff --git a/target/linux/ramips/dts/GL-MT300A.dts b/target/linux/ramips/dts/GL-MT300A.dts
index d4c8351f1ef9808d49ab73f6978fa3adb8fa7fe2..2cea9d9beb69b1b42023467cdeee23e6d6f6b9f3 100644 (file)
--- a/target/linux/ramips/dts/GL-MT300A.dts
+++ b/target/linux/ramips/dts/GL-MT300A.dts
@@ -2,64 +2,62 @@
 
 #include "mt7620a.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "GL-MT300A", "ralink,mt7620a-soc";
+       compatible = "glinet,gl-mt300a", "ralink,mt7620a-soc";
        model = "GL-MT300A";
 
        chosen {
                bootargs = "console=ttyS0,115200";
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                wan {
                        label = "gl-mt300a:wan";
-                       gpios = <&gpio2 0 1>;
+                       gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
                };
 
                lan {
                        label = "gl-mt300a:lan";
-                       gpios = <&gpio2 1 1>;
+                       gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
                        label = "gl-mt300a:wlan";
-                       gpios = <&gpio3 0 1>;
+                       gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
                };
 
                usb {
                        label = "gl-mt300a:usb";
-                       gpios = <&gpio0 7 1>;
+                       gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
                };
-
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
                reset {
                        label = "reset";
-                       gpios = <&gpio0 13 1>;
+                       gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                BTN_0 {
                        label = "BTN_0";
-                       gpios = <&gpio0 1 1>;
+                       gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_0>;
                };
 
-           BTN_1 {
+               BTN_1 {
                        label = "BTN_1";
-                       gpios = <&gpio0 2 1>;
+                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_1>;
                };
-       };
+       };
 };
 
 &gpio0 {
@@ -73,7 +71,7 @@
 &gpio2 {
        status = "okay";
 };
-               
+
 &gpio3 {
        status = "okay";
 };
@@ -82,37 +80,42 @@
        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>;
-               };
-
-               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@ff0000 {
-                       label = "art";
-                       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@ff0000 {
+                               label = "art";
+                               reg = <0xff0000 0x10000>;
+                       };
                };
        };
 };
@@ -130,8 +133,6 @@
 };
 
 &ethernet {
-       pinctrl-names = "default";
-       pinctrl-0 = <&ephy_pins>;
        mtd-mac-address = <&factory 0x4000>;
        mediatek,portmap = "wllll";
 };