ramips: remove model name from LED labels

[openwrt/staging/mkresin.git] / target / linux / ramips / dts / mt7621_d-team_newifi-d2.dts

diff --git a/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts b/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts
index 39c16a569ff50598d3c8f0676da3ab6cf01eccda..5622855f487cba95c1b4213cd55a5f7eabc5c39e 100644 (file)
--- a/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts
+++ b/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "mt7621.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -14,7 +12,7 @@
                led-failsafe = &led_power_blue;
                led-running = &led_power_blue;
                led-upgrade = &led_power_blue;
-               label-mac-device = &ethernet;
+               label-mac-device = &gmac0;
        };
 
        chosen {
@@ -25,56 +23,55 @@
                compatible = "gpio-leds";
 
                power-amber {
-                       label = "newifi-d2:amber:power";
-                       gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
+                       label = "amber:power";
+                       gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                led_power_blue: power-blue {
-                       label = "newifi-d2:blue:power";
-                       gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
+                       label = "blue:power";
+                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                internet-amber {
-                       label = "newifi-d2:amber:internet";
-                       gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+                       label = "amber:internet";
+                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                internet-blue {
-                       label = "newifi-d2:blue:internet";
-                       gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+                       label = "blue:internet";
+                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g {
-                       label = "newifi-d2:blue:wlan2g";
-                       gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+                       label = "blue:wlan2g";
+                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                wlan5g {
-                       label = "newifi-d2:blue:wlan5g";
-                       gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
+                       label = "blue:wlan5g";
+                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "newifi-d2:blue:usb";
-                       gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+                       label = "blue:usb";
+                       gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
                        linux,default-trigger = "usbport";
                };
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               compatible = "gpio-keys";
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
@@ -86,7 +83,7 @@
                power_usb3 {
                        gpio-export,name = "power_usb3";
                        gpio-export,output = <1>;
-                       gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
                };
        };
 };
@@ -94,10 +91,11 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
-               spi-max-frequency = <10000000>;
+               spi-max-frequency = <45000000>;
+               broken-flash-reset;
 
                partitions {
                        compatible = "fixed-partitions";
@@ -150,15 +148,43 @@
        };
 };
 
-&ethernet {
+&gmac0 {
        mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "i2c", "jtag", "uart2", "uart3";
-                       ralink,function = "gpio";
+&switch0 {
+       ports {
+               port@0 {
+                       status = "okay";
+                       label = "lan4";
+               };
+
+               port@1 {
+                       status = "okay";
+                       label = "lan3";
+               };
+
+               port@2 {
+                       status = "okay";
+                       label = "lan2";
+               };
+
+               port@3 {
+                       status = "okay";
+                       label = "lan1";
+               };
+
+               port@4 {
+                       status = "okay";
+                       label = "wan";
+                       mtd-mac-address = <&factory 0xe006>;
                };
        };
 };
+
+&state_default {
+       gpio {
+               groups = "i2c", "jtag", "uart2", "uart3";
+               function = "gpio";
+       };
+};