ar71xx: add mac partition to the MR12/MR16

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

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-mr16.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-mr16.c
index 9f08e3d4c04c337e6e9d768e3881381ac17b2ddc..9da21eab5a5b0a7eabf476462662d949c9f7807d 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-mr16.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-mr16.c
@@ -42,10 +42,8 @@
 
 #define MR16_WAN_PHYMASK    BIT(0)
 
 
 #define MR16_WAN_PHYMASK    BIT(0)
 

-#define MR16_WMAC0_MAC_OFFSET          0x120c
-#define MR16_WMAC1_MAC_OFFSET          0x520c
-#define MR16_CALDATA0_OFFSET           0x1000
-#define MR16_CALDATA1_OFFSET           0x5000
+#define MR16_CALDATA0_OFFSET           0x21000
+#define MR16_CALDATA1_OFFSET           0x25000

 
 static struct gpio_led MR16_leds_gpio[] __initdata = {
        {
 
 static struct gpio_led MR16_leds_gpio[] __initdata = {
        {


@@ -92,8 +90,10 @@ static struct gpio_keys_button MR16_gpio_keys[] __initdata = {
 
 static void __init MR16_setup(void)
 {
 
 static void __init MR16_setup(void)
 {

-       u8 *mac = (u8 *) KSEG1ADDR(0xbfff0000);
-       
+       u8 *mac = (u8 *) KSEG1ADDR(0xbffd0000);
+       u8 wlan0_mac[ETH_ALEN];
+       u8 wlan1_mac[ETH_ALEN];
+

        ath79_register_mdio(0,0x0);
 
        ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
        ath79_register_mdio(0,0x0);
 
        ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);


@@ -109,10 +109,10 @@ static void __init MR16_setup(void)
                                        ARRAY_SIZE(MR16_gpio_keys),
                                        MR16_gpio_keys);
 
                                        ARRAY_SIZE(MR16_gpio_keys),
                                        MR16_gpio_keys);
 

-       ap94_pci_init(mac + MR16_CALDATA0_OFFSET,
-                   mac + MR16_WMAC0_MAC_OFFSET,
-                   mac + MR16_CALDATA1_OFFSET,
-                   mac + MR16_WMAC1_MAC_OFFSET);
+       ath79_init_mac(wlan0_mac, mac, 1);
+       ath79_init_mac(wlan1_mac, mac, 2);
+       ap94_pci_init(mac + MR16_CALDATA0_OFFSET, wlan0_mac,
+                   mac + MR16_CALDATA1_OFFSET, wlan1_mac);

 }
 
 }
 

-MIPS_MACHINE(ATH79_MACH_MR16, "MR16", "Meraki MR16", MR16_setup);
\ No newline at end of file
+MIPS_MACHINE(ATH79_MACH_MR16, "MR16", "Meraki MR16", MR16_setup);