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 bf7f9ee67fd05b6eb84b041b743a9e86a42b3f8e..8a0d7e183d047a66c0bba30eb734590213b02828 100644 (file)
--- 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);