wl18xx: derive the MAC address from the BD_ADDR in fuse ROM

Add the get_mac operation in order to fetch the BD_ADDR from fuse ROM,
so that we can derive the WLAN MAC addresses from it.

Signed-off-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>

diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index df407be9ed445bb8f185b95d6f3d1600f9c3116b..52d63ff1d3521f1c20e6c10d5db2f44aec29e468 100644 (file)
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -975,6 +975,23 @@ static int wl18xx_plt_init(struct wl1271 *wl)
        return wl->ops->boot(wl);
 }
 
+static void wl18xx_get_mac(struct wl1271 *wl)
+{
+       u32 mac1, mac2;
+
+       wlcore_set_partition(wl, &wl->ptable[PART_TOP_PRCM_ELP_SOC]);
+
+       mac1 = wl1271_read32(wl, WL18XX_REG_FUSE_BD_ADDR_1);
+       mac2 = wl1271_read32(wl, WL18XX_REG_FUSE_BD_ADDR_2);
+
+       /* these are the two parts of the BD_ADDR */
+       wl->fuse_oui_addr = ((mac2 & 0xffff) << 8) +
+               ((mac1 & 0xff000000) >> 24);
+       wl->fuse_nic_addr = (mac1 & 0xffffff);
+
+       wlcore_set_partition(wl, &wl->ptable[PART_DOWN]);
+}
+
 static struct wlcore_ops wl18xx_ops = {
        .identify_chip  = wl18xx_identify_chip,
        .boot           = wl18xx_boot,
@@ -994,6 +1011,7 @@ static struct wlcore_ops wl18xx_ops = {
        .set_rx_csum = wl18xx_set_rx_csum,
        .sta_get_ap_rate_mask = wl18xx_sta_get_ap_rate_mask,
        .ap_get_mimo_wide_rate_mask = wl18xx_ap_get_mimo_wide_rate_mask,
+       .get_mac        = wl18xx_get_mac,
 };
 
 /* HT cap appropriate for wide channels */

diff --git a/drivers/net/wireless/ti/wl18xx/reg.h b/drivers/net/wireless/ti/wl18xx/reg.h
index aaedf91ed7b710fe21358adf7716063f5fa70732..43863d35feb2071dfedf4080efb67a044ae4e2fc 100644 (file)
--- a/drivers/net/wireless/ti/wl18xx/reg.h
+++ b/drivers/net/wireless/ti/wl18xx/reg.h
@@ -132,6 +132,9 @@
 #define WL18XX_PG_VER_MASK             0x70
 #define WL18XX_PG_VER_OFFSET           4
 
+#define WL18XX_REG_FUSE_BD_ADDR_1      0xA02602
+#define WL18XX_REG_FUSE_BD_ADDR_2      0xA02606
+
 #define WL18XX_CMD_MBOX_ADDRESS                0xB007B4
 
 #define WL18XX_FW_STATUS_ADDR          0x50F8