Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 694440d9 authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho
Browse files

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: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 6d158ff3

drivers/net/wireless/wl12xx/boot.c

+0 −3
Original line number Diff line number Diff line
@@ -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]);

drivers/net/wireless/wl12xx/cmd.c

+0 −5
Original line number Diff line number Diff line
@@ -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");

drivers/net/wireless/wl12xx/main.c

+0 −8
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/wl12xx/wl12xx.h

+0 −6
Original line number Diff line number Diff line
@@ -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)