#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 = {
{
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);
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);