wl18xx: implement hw op to read PG version

Read the HW PG version of the 18xx chip from FUSE.

Based on an earlier patch by Luciano Coelho <coelho@ti.com>.

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

diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index ce132494ebede1a3e38ff37f8ecb64b92611db9b..9aae0af25fefe95325fffab5ef610d1b9b2dff98 100644 (file)
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -659,8 +659,6 @@ static void wl18xx_boot_soft_reset(struct wl1271 *wl)
 
 static int wl18xx_pre_boot(struct wl1271 *wl)
 {
-       /* TODO: add hw_pg_ver reading */
-
        wl18xx_set_clk(wl);
 
        /* Continue the ELP wake up sequence */
@@ -946,6 +944,20 @@ static u32 wl18xx_ap_get_mimo_wide_rate_mask(struct wl1271 *wl,
        }
 }
 
+static s8 wl18xx_get_pg_ver(struct wl1271 *wl)
+{
+       u32 fuse;
+
+       wlcore_set_partition(wl, &wl->ptable[PART_TOP_PRCM_ELP_SOC]);
+
+       fuse = wl1271_read32(wl, WL18XX_REG_FUSE_DATA_1_3);
+       fuse = (fuse & WL18XX_PG_VER_MASK) >> WL18XX_PG_VER_OFFSET;
+
+       wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+
+       return (s8)fuse;
+}
+
 static void wl18xx_conf_init(struct wl1271 *wl)
 {
        struct wl18xx_priv *priv = wl->priv;
@@ -971,6 +983,7 @@ static struct wlcore_ops wl18xx_ops = {
        .tx_delayed_compl = NULL,
        .hw_init        = wl18xx_hw_init,
        .set_tx_desc_csum = wl18xx_set_tx_desc_csum,
+       .get_pg_ver     = wl18xx_get_pg_ver,
        .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,

diff --git a/drivers/net/wireless/ti/wl18xx/reg.h b/drivers/net/wireless/ti/wl18xx/reg.h
index 1ea3393cff2c31fd73df1fd2dd33bf8ca8b17834..43c480fb837fc43f505667482ea3d8562e81e64f 100644 (file)
--- a/drivers/net/wireless/ti/wl18xx/reg.h
+++ b/drivers/net/wireless/ti/wl18xx/reg.h
@@ -128,6 +128,9 @@
 #define PLLSH_WCS_PLL_SWALLOW_EN_VAL1  0x1
 #define PLLSH_WCS_PLL_SWALLOW_EN_VAL2  0x12
 
+#define WL18XX_REG_FUSE_DATA_1_3       0xA0260C
+#define WL18XX_PG_VER_MASK             0x70
+#define WL18XX_PG_VER_OFFSET           4
 
 #define WL18XX_CMD_MBOX_ADDRESS                0xB007B4