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

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7621_dlink_dir-860l-b1.dts

diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
index 65924bb2e65840ba8bb0233648f4815ea3cc65e5..0426fe5d8f5bd2bf10d2684a6a798b699d774ba6 100644 (file)
--- a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
@@ -1,47 +1,45 @@
-/dts-v1/;
-
 #include "mt7621.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "dlink,dir-860l-b1", "mediatek,mt7621-soc";
        model = "D-Link DIR-860L B1";
 
        aliases {
+               label-mac-device = &gmac0;
+
                led-boot = &led_power_green;
                led-failsafe = &led_power_green;
                led-running = &led_power_green;
                led-upgrade = &led_power_green;
-               label-mac-device = &wifi1;
-       };
-
-       chosen {
-               bootargs = "console=ttyS0,57600";
        };
 
        leds {
                compatible = "gpio-leds";
 
                power {
-                       label = "dir-860l-b1:orange:power";
-                       gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_ORANGE>;
+                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_power_green: power2 {
-                       label = "dir-860l-b1:green:power";
-                       gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
+                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                net {
-                       label = "dir-860l-b1:orange:net";
-                       gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+                       label = "orange:net";
+                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                net2 {
-                       label = "dir-860l-b1:green:net";
-                       gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
+                       label = "green:net";
+                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -50,13 +48,13 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
@@ -65,7 +63,7 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -91,6 +89,24 @@
                                label = "radio";
                                reg = <0x34000 0x4000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_radio_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+
+                                       eeprom_radio_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       eeprom_radio_2000: eeprom@2000 {
+                                               reg = <0x2000 0x200>;
+                                       };
+                               };
                        };
 
                        factory: partition@38000 {
@@ -114,14 +130,62 @@
        };
 };
 
+&gmac0 {
+       nvmem-cells = <&macaddr_radio_4>;
+       nvmem-cell-names = "mac-address";
+};
+
+&gmac1 {
+       status = "okay";
+       label = "wan";
+       phy-handle = <&ethphy0>;
+
+       nvmem-cells = <&macaddr_radio_4>;
+       nvmem-cell-names = "mac-address";
+};
+
+&mdio {
+       ethphy0: ethernet-phy@0 {
+               reg = <0>;
+       };
+};
+
+&switch0 {
+       ports {
+               port@1 {
+                       status = "okay";
+                       label = "lan4";
+               };
+
+               port@2 {
+                       status = "okay";
+                       label = "lan3";
+               };
+
+               port@3 {
+                       status = "okay";
+                       label = "lan2";
+               };
+
+               port@4 {
+                       status = "okay";
+                       label = "lan1";
+               };
+       };
+};
+
 &pcie {
        status = "okay";
+
+       reset-gpios = <&gpio 19 GPIO_ACTIVE_LOW>,
+                     <&gpio 8 GPIO_ACTIVE_LOW>;
 };
 
 &pcie0 {
        wifi0: mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&radio 0x2000>;
+               nvmem-cells = <&eeprom_radio_2000>;
+               nvmem-cell-names = "eeprom";
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };
@@ -129,14 +193,15 @@
 &pcie1 {
        wifi1: mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&radio 0>;
+               nvmem-cells = <&eeprom_radio_0>;
+               nvmem-cell-names = "eeprom";
                ieee80211-freq-limit = <2400000 2500000>;
        };
 };
 
 &state_default {
        gpio {
-               ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-               ralink,function = "gpio";
+               groups = "uart3", "jtag", "wdt";
+               function = "gpio";
        };
 };