ramips: dts: Unify naming of gpio-led nodes

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

diff --git a/target/linux/ramips/dts/WIZFI630A.dts b/target/linux/ramips/dts/WIZFI630A.dts
index 9f1956496912871b4b08373a06fedb6594d1a31b..f88d5ae63fa4eb7c742d166a7ab20eb3a465d26e 100644 (file)
--- a/target/linux/ramips/dts/WIZFI630A.dts
+++ b/target/linux/ramips/dts/WIZFI630A.dts
@@ -2,72 +2,73 @@
 
 #include "rt5350.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "wizfi630a", "ralink,rt5350-soc";
+       compatible = "wiznet,wizfi630a", "ralink,rt5350-soc";
        model = "WIZnet WizFi630A";
 
-       chosen {
-               bootargs = "console=ttyS1,115200";
+       aliases {
+               led-boot = &led_run;
+               led-failsafe = &led_run;
+               led-running = &led_run;
+               led-upgrade = &led_run;
        };
 
-       gpio-export {
-               compatible = "gpio-export";
-               #size-cells = <0>;
+       chosen {
+               bootargs = "console=ttyS1,115200";
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
-               run {
+               led_run: run {
                        label = "wizfi630a::run";
-                       gpios = <&gpio0 1 1>;
+                       gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
                };
 
                wps {
                        label = "wizfi630a::wps";
-                       gpios = <&gpio0 20 1>;
+                       gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
                };
 
                uart1 {
                        label = "wizfi630a::uart1";
-                       gpios = <&gpio0 18 1>;
+                       gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
                };
 
                uart2 {
                        label = "wizfi630a::uart2";
-                       gpios = <&gpio0 21 1>;
+                       gpios = <&gpio0 21 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 17 1>;
+                       gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio0 0 1>;
+                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
-               
+
                scm1 {
                        label = "SCM1";
-                       gpios = <&gpio0 19 1>;
+                       gpios = <&gpio0 19 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_0>;
                };
 
                scm2 {
                        label = "SCM2";
-                       gpios = <&gpio0 2 1>;
+                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_1>;
                };
        };
@@ -81,64 +82,50 @@
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
 
-               partition@0 {
-                       #size-cells = <1>;
-                       label = "uboot";
-                       reg = <0x0 0x30000>;
-                       read-only;
-               };
-
-               partition@30000 {
-                       #size-cells = <1>;
-                       label = "uboot-env";
-                       reg = <0x30000 0x10000>;
-                       read-only;
-               };
-
-               factory: partition@40000 {
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
                        #size-cells = <1>;
-                       label = "factory";
-                       reg = <0x40000 0x10000>;
-                       read-only;
-               };
 
-               partition@50000 {
-                       #size-cells = <1>;
-                       label = "firmware";
-                       reg = <0x50000 0xfb0000>;
+                       partition@0 {
+                               #size-cells = <1>;
+                               label = "uboot";
+                               reg = <0x0 0x30000>;
+                               read-only;
+                       };
+
+                       partition@30000 {
+                               #size-cells = <1>;
+                               label = "uboot-env";
+                               reg = <0x30000 0x10000>;
+                               read-only;
+                       };
+
+                       factory: partition@40000 {
+                               #size-cells = <1>;
+                               label = "factory";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@50000 {
+                               compatible = "denx,uimage";
+                               #size-cells = <1>;
+                               label = "firmware";
+                               reg = <0x50000 0xfb0000>;
+                       };
                };
        };
 };
 
 &uart {
-       compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a";
-       reg = <0x500 0x100>;
-       resets = <&rstctrl 12>;
-       reset-names = "uart";
-       interrupt-parent = <&intc>;
-       interrupts = <5>;
-       reg-shift = <2>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&uartf_pins>;
        status = "okay";
-};
-
-&uartlite {
-       compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a";
-       reg = <0xc00 0x100>;
-       resets = <&rstctrl 19>;
-       reset-names = "uartl";
-       interrupt-parent = <&intc>;
-       interrupts = <12>;
-       reg-shift = <2>;
        pinctrl-names = "default";
-       pinctrl-0 = <&uartlite_pins>;
+       pinctrl-0 = <&uartf_pins>;
 };
 
 &pinctrl {
@@ -148,20 +135,6 @@
                        ralink,function = "gpio";
                };
        };
-
-       uartf_gpio_pins: uartf_gpio {
-               uartf_gpio {
-                       ralink,group = "uartf";
-                       ralink,function = "uartf";
-               };
-       };
-
-       uartlite_pins: uartlite {
-               uart {
-                       ralink,group = "uartlite";
-                       ralink,function = "uartlite";
-               };
-       };
 };
 
 &ethernet {