From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 3 Jan 2016 14:48:20 +0000 (+0000)
Subject: ar71xx: fix MAC address swapping on WNR2200 and fix the WLAN MAC address
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3ca5f0535b72a284fa3bfa6eea62e9e3ea58307f;p=openwrt%2Fsvn-archive%2Fopenwrt.git

ar71xx: fix MAC address swapping on WNR2200 and fix the WLAN MAC address

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

Backport of r47871

SVN-Revision: 48090
---

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
index bf7f9ee67f..8a0d7e183d 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
@@ -42,8 +42,8 @@
 #define WNR2200_KEYS_POLL_INTERVAL	20 /* msecs */
 #define WNR2200_KEYS_DEBOUNCE_INTERVAL	(3 * WNR2200_KEYS_POLL_INTERVAL)
 
-#define WNR2200_MAC0_OFFSET		0
-#define WNR2200_MAC1_OFFSET		6
+#define WNR2200_MAC0_OFFSET		6
+#define WNR2200_MAC1_OFFSET		0
 #define WNR2200_PCIE_CALDATA_OFFSET	0x1000
 
 static struct gpio_led wnr2200_leds_gpio[] __initdata = {
@@ -121,7 +121,8 @@ static void __init wnr2200_setup(void)
 	ath79_register_eth(1);
 
 	ath79_register_m25p80(NULL);
-	ap91_pci_init(art + WNR2200_PCIE_CALDATA_OFFSET, NULL);
+	ap91_pci_init(art + WNR2200_PCIE_CALDATA_OFFSET,
+		      art + WNR2200_MAC0_OFFSET);
 
 	ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr2200_leds_gpio),
 					wnr2200_leds_gpio);