From: Sven Eckelmann Date: Thu, 7 Jun 2018 08:57:06 +0000 (+0200) Subject: ar71xx: Fix offset to WMAC address for 8devices Lima X-Git-Tag: v18.06.0-rc1~54 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=503f7f0614ec8f017f375f4a84fd8b8c75609a86;p=oweals%2Fopenwrt.git ar71xx: Fix offset to WMAC address for 8devices Lima The ART partition of the Lima board stores exactly three mac addresses: * 0x0: eth0 * 0x6: eth1 * 0x1002: wmac The first two are correctly assigned in the mach file but the latter points to 0x800. But this position is set to ff:ff:ff:ff:ff:ff. Luckily, the driver falls back in ath9k_hw_init_macaddr to the EEPROM mac address when it doesn't find a valid mac address in the platform_data. Remove this bogus offset to the ART partition to directly load the wmac via the EEPROM data in the ART partition. Signed-off-by: Sven Eckelmann (cherry picked from commit 4f6320704f7e37368a1dae2deba767a73b3bf121) --- diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-lima.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-lima.c index 9c784f7921..9867429684 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-lima.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-lima.c @@ -35,7 +35,6 @@ #define LIMA_MAC1_OFFSET 0x0006 #define LIMA_CALDATA_OFFSET 0x1000 -#define LIMA_WMAC_MAC_OFFSET 0x0800 static struct gpio_keys_button lima_gpio_keys[] __initdata = { { @@ -79,8 +78,7 @@ static void __init lima_setup(void) ath79_eth0_data.phy_mask = BIT(0); ath79_register_eth(0); - ath79_register_wmac(art + LIMA_CALDATA_OFFSET, - art + LIMA_WMAC_MAC_OFFSET); + ath79_register_wmac(art + LIMA_CALDATA_OFFSET, NULL); ath79_register_usb(); ath79_register_pci(); }