ramips: express diag led handling via devicetree

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / DCH-M225.dts

diff --git a/target/linux/ramips/dts/DCH-M225.dts b/target/linux/ramips/dts/DCH-M225.dts
index 3465c70ad0e04edfe9af21ab3640cf8d2268883c..b2184369299a7f4061f89d766254d8ed139951cc 100644 (file)
--- a/target/linux/ramips/dts/DCH-M225.dts
+++ b/target/linux/ramips/dts/DCH-M225.dts
@@ -2,27 +2,30 @@
 
 #include "mt7620a.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
 / {
        compatible = "dlink,dch-m225", "ralink,mt7620a-soc";
        model = "D-Link DCH-M225";
 
+       aliases {
+               led-status = &led_power;
+       };
+
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <100>;
 
                wps {
                        label = "wps";
-                       gpios = <&gpio0 11 1>;
+                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RFKILL>;
                };
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 2 1>;
+                       gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -30,14 +33,16 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               power {
+               led_power: power {
                        label = "dch-m225:green:power";
-                       gpios = <&gpio1 5 1>;
+                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       default-state = "on";
                };
 
                status {
                        label = "dch-m225:red:status";
-                       gpios = <&gpio1 0 1>;
+                       gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
+                       default-state = "off";
                };
        };
 
@@ -53,7 +58,7 @@
                        "Headphones", "HP_L",
                        "Headphones", "HP_R";
                simple-audio-card,mclk-fs = <256>;
-               simple-audio-card,hp-det-gpio = <&gpio0 14 1>;
+               simple-audio-card,hp-det-gpio = <&gpio0 14 GPIO_ACTIVE_LOW>;
 
                simple-audio-card,cpu {
                        sound-dai = <&i2s>;
@@ -89,59 +94,63 @@
        #sound-dai-cells = <0>;
        status = "okay";
        pinctrl-names = "default";
-       pinctrl-0 = <&gpio_i2s_pins>, <&wm8960_mclk_pins>;
+       pinctrl-0 = <&mdio_refclk_pins>;
 };
 
 &spi0 {
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <80000000>;
                m25p,fast-read;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x0 0x30000>;
-                       read-only;
-               };
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-               partition@30000 {
-                       label = "u-boot-env";
-                       reg = <0x30000 0x4000>;
-                       read-only;
-               };
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x30000>;
+                               read-only;
+                       };
 
-               factory: partition@34000 {
-                       label = "factory";
-                       reg = <0x34000 0x4000>;
-                       read-only;
-               };
+                       partition@30000 {
+                               label = "u-boot-env";
+                               reg = <0x30000 0x4000>;
+                               read-only;
+                       };
 
-               nvram: partition@38000 {
-                       label = "nvram";
-                       reg = <0x38000 0x8000>;
-                       read-only;
-               };
+                       factory: partition@34000 {
+                               label = "factory";
+                               reg = <0x34000 0x4000>;
+                               read-only;
+                       };
 
-               partition@40000 {
-                       label = "devconf";
-                       reg = <0x40000 0x10000>;
-                       read-only;
-               };
+                       nvram: partition@38000 {
+                               label = "nvram";
+                               reg = <0x38000 0x8000>;
+                               read-only;
+                       };
 
-               partition@50000 {
-                       label = "upgrade_rec";
-                       reg = <0x50000 0x100000>;
-                       read-only;
-               };
+                       partition@40000 {
+                               label = "devconf";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
 
-               partition@150000 {
-                       label = "firmware";
-                       reg = <0x150000 0x6b0000>;
+                       partition@50000 {
+                               label = "upgrade_rec";
+                               reg = <0x50000 0x100000>;
+                               read-only;
+                       };
+
+                       partition@150000 {
+                               label = "firmware";
+                               reg = <0x150000 0x6b0000>;
+                       };
                };
        };
 };
@@ -157,16 +166,9 @@
                        ralink,function = "gpio";
                };
 
-               pa {
-                       ralink,group = "pa";
-                       ralink,function = "pa";
-               };
-
-               wm8960_mclk_pins: wm8960_mclk {
-                       wm8960_mclk {
-                               ralink,group = "mdio";
-                               ralink,function = "refclk";
-                       };
+               gpio_i2s {
+                       ralink,group = "uartf";
+                       ralink,function = "gpio i2s";
                };
        };
 };
@@ -181,5 +183,6 @@
 
 &wmac {
        ralink,mtd-eeprom = <&factory 0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pa_pins>;
 };
-