aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-03 14:48:20 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-03 14:48:20 +0000
commit9ca65c3ef07afb564ad8ac50ac55690f97595431 (patch)
treef81bbeaafdb4f78592c91bc7ceb2aaa9db31cac7
parent31120eb1887ce4410a44cfb4f3135271860afd2c (diff)
downloadupstream-9ca65c3ef07afb564ad8ac50ac55690f97595431.tar.gz
upstream-9ca65c3ef07afb564ad8ac50ac55690f97595431.tar.bz2
upstream-9ca65c3ef07afb564ad8ac50ac55690f97595431.zip
ar71xx: fix MAC address swapping on WNR2200 and fix the WLAN MAC address
Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r47871 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48090 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c7
1 files changed, 4 insertions, 3 deletions
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);