ramips: move redundant console setup to mt7621 SoC DTSI

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

diff --git a/target/linux/ramips/dts/mt7621_totolink_a7000r.dts b/target/linux/ramips/dts/mt7621_totolink_a7000r.dts
index 4791862a6f3f056c84d00bbd53de4d2050dd254e..93de34489b7d7904326334a8d2360ef2a700ca27 100644 (file)
--- a/target/linux/ramips/dts/mt7621_totolink_a7000r.dts
+++ b/target/linux/ramips/dts/mt7621_totolink_a7000r.dts
@@ -17,21 +17,12 @@
                led-upgrade = &led_sys;
        };
 
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x8000000>;
-       };
-
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
                led_sys: sys {
                        label = "a7000r:blue:sys";
-                       gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -40,7 +31,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                        debounce-interval = <60>;
                        linux,code = <KEY_RESTART>;
                };
@@ -109,15 +100,44 @@
        };
 };
 
-&ethernet {
+&gmac0 {
        mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "i2c", "wdt";
-                       ralink,function = "gpio";
+&switch0 {
+       ports {
+               port@0 {
+                       status = "okay";
+                       label = "lan1";
+               };
+
+               port@1 {
+                       status = "okay";
+                       label = "lan2";
+               };
+
+               port@2 {
+                       status = "okay";
+                       label = "lan3";
                };
+
+               port@3 {
+                       status = "okay";
+                       label = "lan4";
+               };
+
+               port@4 {
+                       status = "okay";
+                       label = "wan";
+                       mtd-mac-address = <&factory 0xe000>;
+                       mtd-mac-address-increment = <1>;
+               };
+       };
+};
+
+&state_default {
+       gpio {
+               groups = "i2c", "wdt";
+               function = "gpio";
        };
 };