From 315904a459f5d40c1f20dc390f5101f058e6e6e1 Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Mon, 28 Sep 2020 00:04:33 +0200
Subject: [PATCH] ramips: merge ethernet setup for RT-AC51U/RT-AC54U

The ethernet setup/label MAC address for RT-AC51U and RT-AC54U are
the same, so move them into the shared DTSI.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts | 5 -----
 target/linux/ramips/dts/mt7620a_asus_rt-ac54u.dts | 5 -----
 target/linux/ramips/dts/mt7620a_asus_rt-ac5x.dtsi | 6 ++++++
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts b/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts
index fb0d8a632d..f517e2c0e2 100644
--- a/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts
+++ b/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts
@@ -5,7 +5,6 @@
 	model = "Asus RT-AC51U";
 
 	aliases {
-		label-mac-device = &ethernet;
 		led-boot = &led_power;
 		led-failsafe = &led_power;
 		led-running = &led_power;
@@ -35,10 +34,6 @@
 	};
 };
 
-&ethernet {
-	mtd-mac-address = <&factory 0x28>;
-};
-
 &state_default {
 	gpio {
 		groups = "i2c", "wled", "uartf";
diff --git a/target/linux/ramips/dts/mt7620a_asus_rt-ac54u.dts b/target/linux/ramips/dts/mt7620a_asus_rt-ac54u.dts
index 3e150feb15..d0ff5d6d70 100644
--- a/target/linux/ramips/dts/mt7620a_asus_rt-ac54u.dts
+++ b/target/linux/ramips/dts/mt7620a_asus_rt-ac54u.dts
@@ -7,7 +7,6 @@
 	model = "Asus RT-AC54U";
 
 	aliases {
-		label-mac-device = &ethernet;
 		led-boot = &led_power;
 		led-failsafe = &led_power;
 		led-running = &led_power;
@@ -37,10 +36,6 @@
 	};
 };
 
-&ethernet {
-	mtd-mac-address = <&factory 0x28>;
-};
-
 &state_default {
 	gpio {
 		groups = "i2c", "wled", "uartf";
diff --git a/target/linux/ramips/dts/mt7620a_asus_rt-ac5x.dtsi b/target/linux/ramips/dts/mt7620a_asus_rt-ac5x.dtsi
index 3813efaa53..adec8a1a6f 100644
--- a/target/linux/ramips/dts/mt7620a_asus_rt-ac5x.dtsi
+++ b/target/linux/ramips/dts/mt7620a_asus_rt-ac5x.dtsi
@@ -4,6 +4,10 @@
 #include <dt-bindings/input/input.h>
 
 / {
+	aliases {
+		label-mac-device = &ethernet;
+	};
+
 	keys {
 		compatible = "gpio-keys";
 
@@ -85,6 +89,8 @@
 };
 
 &ethernet {
+	mtd-mac-address = <&factory 0x28>;
+
 	mediatek,portmap = "wllll";
 };
 
-- 
2.30.2