From: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Date: Thu, 24 Oct 2019 13:29:14 +0000 (+0200)
Subject: ath79: remove wmac mtd-mac-address for UniFi AC family
X-Git-Tag: v19.07.5~25
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=589c3cf4e08731e4971d2db6c83e16b5ab959878;p=openwrt%2Fstaging%2Fchunkeey.git

ath79: remove wmac mtd-mac-address for UniFi AC family

The MAC address for the wmac 2.4 GHz radio of the Ubiquiti UniFi AC
family of devices is actually embedded in the mtd-cal-data, so there
is no need for mtd-mac-address (which was incorrectly forcing wmac
to have the same MAC as eth0). This makes it coherent with the stock
firmware and the ar71xx target:

 · XX:XX:XX:X0:XX:XX eth0
 · XX:XX:XX:X1:XX:XX ath0/wlan1 (2.4 GHz)
 · XX:XX:XX:X2:XX:XX ath1/wlan0 (5 GHz)

Checked on a UniFi AC Mesh, a UniFi AC LR and a UniFi Lite.

Signed-off-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>
(cherry picked from commit 20ace70db65c3f1cb6a842d3092ac2eb7be81b5a)
---

diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
index 7f72155c0f..af726b2c4f 100644
--- a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
+++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
@@ -112,6 +112,6 @@
 
 &wmac {
 	status = "okay";
+
 	mtd-cal-data = <&eeprom 0x1000>;
-	mtd-mac-address = <&eeprom 0x0>;
 };