1 files changed, 18 insertions, 34 deletions

diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/wl12xx/boot.c
index 5ebc64d89407..681337914976 100644
--- a/drivers/net/wireless/wl12xx/boot.c
+++ b/drivers/net/wireless/wl12xx/boot.c
@@ -23,6 +23,7 @@
 
 #include <linux/slab.h>
 #include <linux/wl12xx.h>
+#include <linux/export.h>
 
 #include "acx.h"
 #include "reg.h"
@@ -107,16 +108,6 @@ static unsigned int wl12xx_get_fw_ver_quirks(struct wl1271 *wl)
         unsigned int quirks = 0;
         unsigned int *fw_ver = wl->chip.fw_ver;
 
-        /* Only for wl127x */
-        if ((fw_ver[FW_VER_CHIP] == FW_VER_CHIP_WL127X) &&
-            /* Check STA version */
-            (((fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_STA) &&
-              (fw_ver[FW_VER_MINOR] < FW_VER_MINOR_1_SPARE_STA_MIN)) ||
-             /* Check AP version */
-             ((fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_AP) &&
-              (fw_ver[FW_VER_MINOR] < FW_VER_MINOR_1_SPARE_AP_MIN))))
-                quirks |= WL12XX_QUIRK_USE_2_SPARE_BLOCKS;
-
         /* Only new station firmwares support routing fw logs to the host */
         if ((fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_STA) &&
             (fw_ver[FW_VER_MINOR] < FW_VER_MINOR_FWLOG_STA_MIN))
@@ -304,9 +295,7 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl)
                  */
                 if (wl->nvs_len == sizeof(struct wl1271_nvs_file) ||
                     wl->nvs_len == WL1271_INI_LEGACY_NVS_FILE_SIZE) {
-                        /* for now 11a is unsupported in AP mode */
-                        if (wl->bss_type != BSS_TYPE_AP_BSS &&
-                            nvs->general_params.dual_mode_select)
+                        if (nvs->general_params.dual_mode_select)
                                 wl->enable_11a = true;
                 }
 
@@ -504,21 +493,19 @@ static int wl1271_boot_run_firmware(struct wl1271 *wl)
         wl->event_mask = BSS_LOSE_EVENT_ID |
                 SCAN_COMPLETE_EVENT_ID |
                 PS_REPORT_EVENT_ID |
-                JOIN_EVENT_COMPLETE_ID |
                 DISCONNECT_EVENT_COMPLETE_ID |
                 RSSI_SNR_TRIGGER_0_EVENT_ID |
                 PSPOLL_DELIVERY_FAILURE_EVENT_ID |
                 SOFT_GEMINI_SENSE_EVENT_ID |
                 PERIODIC_SCAN_REPORT_EVENT_ID |
-                PERIODIC_SCAN_COMPLETE_EVENT_ID;
-
-        if (wl->bss_type == BSS_TYPE_AP_BSS)
-                wl->event_mask |= STA_REMOVE_COMPLETE_EVENT_ID |
-                                  INACTIVE_STA_EVENT_ID |
-                                  MAX_TX_RETRY_EVENT_ID;
-        else
-                wl->event_mask |= DUMMY_PACKET_EVENT_ID |
-                        BA_SESSION_RX_CONSTRAINT_EVENT_ID;
+                PERIODIC_SCAN_COMPLETE_EVENT_ID |
+                DUMMY_PACKET_EVENT_ID |
+                PEER_REMOVE_COMPLETE_EVENT_ID |
+                BA_SESSION_RX_CONSTRAINT_EVENT_ID |
+                REMAIN_ON_CHANNEL_COMPLETE_EVENT_ID |
+                INACTIVE_STA_EVENT_ID |
+                MAX_TX_RETRY_EVENT_ID |
+                CHANNEL_SWITCH_COMPLETE_EVENT_ID;
 
         ret = wl1271_event_unmask(wl);
         if (ret < 0) {
@@ -549,13 +536,13 @@ static void wl1271_boot_hw_version(struct wl1271 *wl)
 {
         u32 fuse;
 
-        fuse = wl1271_top_reg_read(wl, REG_FUSE_DATA_2_1);
+        if (wl->chip.id == CHIP_ID_1283_PG20)
+                fuse = wl1271_top_reg_read(wl, WL128X_REG_FUSE_DATA_2_1);
+        else
+                fuse = wl1271_top_reg_read(wl, WL127X_REG_FUSE_DATA_2_1);
         fuse = (fuse & PG_VER_MASK) >> PG_VER_OFFSET;
 
         wl->hw_pg_ver = (s8)fuse;
-
-        if (((wl->hw_pg_ver & PG_MAJOR_VER_MASK) >> PG_MAJOR_VER_OFFSET) < 3)
-                wl->quirks |= WL12XX_QUIRK_END_OF_TRANSACTION;
 }
 
 static int wl128x_switch_tcxo_to_fref(struct wl1271 *wl)
@@ -696,7 +683,8 @@ static int wl127x_boot_clk(struct wl1271 *wl)
         u32 pause;
         u32 clk;
 
-        wl1271_boot_hw_version(wl);
+        if (((wl->hw_pg_ver & PG_MAJOR_VER_MASK) >> PG_MAJOR_VER_OFFSET) < 3)
+                wl->quirks |= WL12XX_QUIRK_END_OF_TRANSACTION;
 
         if (wl->ref_clock == CONF_REF_CLK_19_2_E ||
             wl->ref_clock == CONF_REF_CLK_38_4_E ||
@@ -750,6 +738,8 @@ int wl1271_load_firmware(struct wl1271 *wl)
         u32 tmp, clk;
         int selected_clock = -1;
 
+        wl1271_boot_hw_version(wl);
+
         if (wl->chip.id == CHIP_ID_1283_PG20) {
                 ret = wl128x_boot_clk(wl, &selected_clock);
                 if (ret < 0)
@@ -781,9 +771,6 @@ int wl1271_load_firmware(struct wl1271 *wl)
                 clk |= (wl->ref_clock << 1) << 4;
         }
 
-        if (wl->quirks & WL12XX_QUIRK_LPD_MODE)
-                clk |= SCRATCH_ENABLE_LPD;
-
         wl1271_write32(wl, DRPW_SCRATCH_START, clk);
 
         wl1271_set_partition(wl, &part_table[PART_WORK]);
@@ -852,9 +839,6 @@ int wl1271_boot(struct wl1271 *wl)
         /* Enable firmware interrupts now */
         wl1271_boot_enable_interrupts(wl);
 
-        /* set the wl1271 default filters */
-        wl1271_set_default_filters(wl);
-
         wl1271_event_mbox_config(wl);
 
 out: