ar71xx: add mac partition to the MR12/MR16

[openwrt/staging/florian.git] / target / linux / ar71xx / files / arch / mips / ath79 / mach-mr12.c

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-mr12.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-mr12.c
index 12c9a1cb5d932d0b579e865f122f653b03b47170..5a337e5c9f99dbfd64d1657b9d39d08163e05e58 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-mr12.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-mr12.c
@@ -42,8 +42,7 @@
 
 #define MR12_WAN_PHYMASK    BIT(4)
 
-#define MR12_WMAC0_MAC_OFFSET           0x120c
-#define MR12_CALDATA0_OFFSET            0x1000
+#define MR12_CALDATA0_OFFSET            0x21000
 
 static struct gpio_led MR12_leds_gpio[] __initdata = {
        {
@@ -90,8 +89,9 @@ static struct gpio_keys_button MR12_gpio_keys[] __initdata = {
 
 static void __init MR12_setup(void)
 {
-       u8 *mac = (u8 *) KSEG1ADDR(0xbfff0000);
-       
+       u8 *mac = (u8 *) KSEG1ADDR(0xbffd0000);
+       u8 wlan_mac[ETH_ALEN];
+
        ath79_register_mdio(0,0x0);
 
        ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
@@ -107,9 +107,8 @@ static void __init MR12_setup(void)
                                        ARRAY_SIZE(MR12_gpio_keys),
                                        MR12_gpio_keys);
 
-       ap91_pci_init(mac + MR12_CALDATA0_OFFSET,
-                               mac + MR12_WMAC0_MAC_OFFSET);
-
+       ath79_init_mac(wlan_mac, mac, 1);
+       ap91_pci_init(mac + MR12_CALDATA0_OFFSET, wlan_mac);
 }
 
-MIPS_MACHINE(ATH79_MACH_MR12, "MR12", "Meraki MR12", MR12_setup);
\ No newline at end of file
+MIPS_MACHINE(ATH79_MACH_MR12, "MR12", "Meraki MR12", MR12_setup);