ramips: convert to new LED color/function format where possible

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7628an_buffalo_wcr-1166ds.dts

diff --git a/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts b/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts
index 602ea8c5dec91230b52bf069e4dd881f129a1eb5..02c48791b6a00e5b943770b03d2a2e4591b4e599 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts
+++ b/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts
@@ -1,9 +1,8 @@
-/dts-v1/;
-
 #include "mt7628an.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "buffalo,wcr-1166ds", "mediatek,mt7628an-soc";
@@ -17,25 +16,24 @@
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               compatible = "gpio-keys";
 
                aoss {
                        label = "aoss";
-                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
 
                ap {
                        label = "ap";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_0>;
                        linux,input-type = <EV_SW>;
                };
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -44,43 +42,44 @@
                compatible = "gpio-leds";
 
                router_o {
-                       label = "wcr-1166ds:orange:router";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       label = "orange:router";
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
 
                router_g {
-                       label = "wcr-1166ds:green:router";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       label = "green:router";
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                };
 
                internet_o {
-                       label = "wcr-1166ds:orange:internet";
-                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                       label = "orange:internet";
+                       gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
 
                internet_g {
-                       label = "wcr-1166ds:green:internet";
-                       gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
+                       label = "green:internet";
+                       gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
                };
 
                wireless_o {
-                       label = "wcr-1166ds:orange:wireless";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       label = "orange:wireless";
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                };
 
                wireless_g {
-                       label = "wcr-1166ds:green:wireless";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       label = "green:wireless";
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
 
                diag {
-                       label = "wcr-1166ds:orange:diag";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       label = "orange:diag";
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
 
                led_power: power {
-                       label = "wcr-1166ds:green:power";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
 };
@@ -105,27 +104,26 @@
 &pcie0 {
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x8000>;
+               nvmem-cells = <&eeprom_factory_8000>;
+               nvmem-cell-names = "eeprom";
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "uart1", "wled_an", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt", "refclk", "gpio", "i2s";
-                       ralink,function = "gpio";
-               };
+&state_default {
+       gpio {
+               groups = "uart1", "wled_an", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt", "refclk", "gpio", "i2s";
+               function = "gpio";
        };
 };
 
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
-               spi-max-frequency = <10000000>;
+               spi-max-frequency = <40000000>;
 
                partitions {
                        compatible = "fixed-partitions";
@@ -148,10 +146,25 @@
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
-                               compatible = "openwrt,trx";
+                               compatible = "brcm,trx";
+                               brcm,trx-magic = <0x746f435c>;
                                label = "firmware";
                                reg = <0x50000 0x7c0000>;
                        };
@@ -178,4 +191,7 @@
 
 &wmac {
        status = "okay";
+
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };