wl12xx: disable AP-mode-specific quirks

The current wl12xx fw (7.3.0.0.77) supports both STA and AP mode, and
we no longer use AP-mode-specific quirks.

WL12XX_QUIRK_END_OF_TRANSACTION is still used for certain HWs, while
WL12XX_QUIRK_LPD_MODE is not used anymore.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/wl12xx/boot.c
index 9b400270397b95e99ff83a40d959717cfa9eefa2..d4e628db76b03be00406f1e1629251d3700c2909 100644 (file)
--- a/drivers/net/wireless/wl12xx/boot.c
+++ b/drivers/net/wireless/wl12xx/boot.c
@@ -770,9 +770,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]);

diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/wl12xx/cmd.c
index 8c963a6bb0a5104a970fa8bb1120dd7f26f4feca..a52299e548fa38bfd8fa76d4013b2d37d8e4f3e0 100644 (file)
--- a/drivers/net/wireless/wl12xx/cmd.c
+++ b/drivers/net/wireless/wl12xx/cmd.c
@@ -134,11 +134,6 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)
        /* Override the REF CLK from the NVS with the one from platform data */
        gen_parms->general_params.ref_clock = wl->ref_clock;
 
-       /* LPD mode enable (bits 6-7) in WL1271 AP mode only */
-       if (wl->quirks & WL12XX_QUIRK_LPD_MODE)
-               gen_parms->general_params.general_settings |=
-                       GENERAL_SETTINGS_DRPW_LPD;
-
        ret = wl1271_cmd_test(wl, gen_parms, sizeof(*gen_parms), answer);
        if (ret < 0) {
                wl1271_warning("CMD_INI_FILE_GENERAL_PARAM failed");

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 6b8a8a339f96ecf091151dd21e0c5d17136dc4a3..884f82b632190e6d480d15dcd14af33b04fc1d2a 100644 (file)
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -1333,14 +1333,6 @@ static int wl1271_chip_wakeup(struct wl1271 *wl)
                wl1271_debug(DEBUG_BOOT, "chip id 0x%x (1271 PG20)",
                             wl->chip.id);
 
-               /*
-                * 'end-of-transaction flag' and 'LPD mode flag'
-                * should be set in wl127x AP mode only
-                */
-               if (wl->bss_type == BSS_TYPE_AP_BSS)
-                       wl->quirks |= (WL12XX_QUIRK_END_OF_TRANSACTION |
-                                      WL12XX_QUIRK_LPD_MODE);
-
                ret = wl1271_setup(wl);
                if (ret < 0)
                        goto out;

diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 02644b4fb6978b7109b75958d546b629a134c6ee..1ec90fc7505ebd3f0dffd6f8ef5ff9ca0e9118ce 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -672,12 +672,6 @@ size_t wl12xx_copy_fwlog(struct wl1271 *wl, u8 *memblock, size_t maxlen);
 /* WL128X requires aggregated packets to be aligned to the SDIO block size */
 #define WL12XX_QUIRK_BLOCKSIZE_ALIGNMENT       BIT(2)
 
-/*
- * WL127X AP mode requires Low Power DRPw (LPD) enable to reduce power
- * consumption
- */
-#define WL12XX_QUIRK_LPD_MODE                   BIT(3)
-
 /* Older firmwares did not implement the FW logger over bus feature */
 #define WL12XX_QUIRK_FWLOG_NOT_IMPLEMENTED     BIT(4)