From: Shiji Yang <yangshiji66@qq.com>
Date: Wed, 5 May 2021 11:48:01 +0000 (+0800)
Subject: ramips: fix mac addresses of Youku YK1
X-Git-Tag: v21.02.0-rc2~47
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ceeaf0b63d33685beb96bdb7509ef9ed05b93b02;p=openwrt%2Fstaging%2Fhauke.git

ramips: fix mac addresses of Youku YK1

MAC addresses read from official firmware

        value       location
Wlan    xx 71 de    factory@0x04
Lan     xx 71 dd    factory@0x28
Wan     xx 71 df    factory@0x2e
Label   xx 71 dd    factory@0x28

Signed-off-by: Shiji Yang <yangshiji66@qq.com>
[fix sorting in 02_network, redact commit message]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
(cherry picked from commit e57e460dc75836d3227e7370b9e64a0eabc9d91d)
---

diff --git a/target/linux/ramips/dts/mt7620a_youku_yk1.dts b/target/linux/ramips/dts/mt7620a_youku_yk1.dts
index 86e2031aa6..61da408f27 100644
--- a/target/linux/ramips/dts/mt7620a_youku_yk1.dts
+++ b/target/linux/ramips/dts/mt7620a_youku_yk1.dts
@@ -12,6 +12,7 @@
 		led-failsafe = &led_power;
 		led-running = &led_power;
 		led-upgrade = &led_power;
+		label-mac-device = &ethernet;
 	};
 
 	leds {
@@ -114,7 +115,7 @@
 &ethernet {
 	pinctrl-names = "default";
 
-	mtd-mac-address = <&factory 0x4>;
+	mtd-mac-address = <&factory 0x28>;
 
 	mediatek,portmap = "llllw";
 };
diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network
index 398d275dae..919102b130 100755
--- a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network
@@ -255,7 +255,6 @@ ramips_setup_macs()
 	sanlinking,d240|\
 	vonets,var11n-300|\
 	wrtnode,wrtnode|\
-	youku,yk1|\
 	zbtlink,zbt-ape522ii|\
 	zbtlink,zbt-wa05|\
 	zbtlink,zbt-we2026|\
@@ -339,7 +338,8 @@ ramips_setup_macs()
 	lenovo,newifi-y1|\
 	lenovo,newifi-y1s|\
 	ohyeah,oy-0001|\
-	wavlink,wl-wn530hg4)
+	wavlink,wl-wn530hg4|\
+	youku,yk1)
 		wan_mac=$(mtd_get_mac_binary factory 0x2e)
 		;;
 	linksys,e1700)