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

Commit 1aed55fd authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Luciano Coelho
Browse files

wl12xx: 1281/1283 support - Use different FW file for AP mode wl127x/wl128x chips 



Choose a different FW for AP-mode wl127x and wl128x chips, base on chip
ID at boot time.

Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Reviewed-by: default avatarLuciano Coelho <coelho@ti.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent ae47c45f

drivers/net/wireless/wl12xx/main.c

+4 −1
Original line number Diff line number Diff line
@@ -832,7 +832,10 @@ static int wl1271_fetch_firmware(struct wl1271 *wl) 


	switch (wl->bss_type) {

	case BSS_TYPE_AP_BSS:

		fw_name = WL1271_AP_FW_NAME;

		if (wl->chip.id == CHIP_ID_1283_PG20)

			fw_name = WL128X_AP_FW_NAME;

		else

			fw_name = WL127X_AP_FW_NAME;

		break;

	case BSS_TYPE_IBSS:

	case BSS_TYPE_STA_BSS:

drivers/net/wireless/wl12xx/sdio.c

+2 −1
Original line number Diff line number Diff line
@@ -361,4 +361,5 @@ MODULE_AUTHOR("Luciano Coelho <coelho@ti.com>"); 
MODULE_AUTHOR("Juuso Oikarinen <juuso.oikarinen@nokia.com>");

MODULE_FIRMWARE(WL1271_FW_NAME);

MODULE_FIRMWARE(WL128X_FW_NAME);

MODULE_FIRMWARE(WL1271_AP_FW_NAME);
 
MODULE_FIRMWARE(WL127X_AP_FW_NAME);

MODULE_FIRMWARE(WL128X_AP_FW_NAME);

drivers/net/wireless/wl12xx/spi.c

+2 −1
Original line number Diff line number Diff line
@@ -493,5 +493,6 @@ MODULE_AUTHOR("Luciano Coelho <coelho@ti.com>"); 
MODULE_AUTHOR("Juuso Oikarinen <juuso.oikarinen@nokia.com>");

MODULE_FIRMWARE(WL1271_FW_NAME);

MODULE_FIRMWARE(WL128X_FW_NAME);

MODULE_FIRMWARE(WL1271_AP_FW_NAME);

MODULE_FIRMWARE(WL127X_AP_FW_NAME);

MODULE_FIRMWARE(WL128X_AP_FW_NAME);

MODULE_ALIAS("spi:wl1271");

drivers/net/wireless/wl12xx/wl12xx.h

+2 −1
Original line number Diff line number Diff line
@@ -132,7 +132,8 @@ extern u32 wl12xx_debug_level; 


#define WL1271_FW_NAME "ti-connectivity/wl1271-fw-2.bin"

#define WL128X_FW_NAME "ti-connectivity/wl128x-fw.bin"

#define WL1271_AP_FW_NAME "ti-connectivity/wl1271-fw-ap.bin"

#define WL127X_AP_FW_NAME "ti-connectivity/wl1271-fw-ap.bin"

#define WL128X_AP_FW_NAME "ti-connectivity/wl128x-fw-ap.bin"



/*

 * wl127x and wl128x are using the same NVS file name. However, the