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

Commit 750a986d authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho
Browse files

wl18xx: change fw name and temporarily fail loading 



The new fw (8.5.0.0.28) is not backward compatible
with older drivers.

Use a new fw name (along with bumping the min
fw version), and add some code to fail
any boot attempt during the fw api alignment
patches (as the driver is not functional in
these transitional patches).

This code will be removed after the api alignment
will be done.

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 512c5385

drivers/net/wireless/ti/wl18xx/main.c

+5 −1
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ static const struct wl18xx_clk_cfg wl18xx_clk_table[NUM_CLOCK_CONFIGS] = { 
};



/* TODO: maybe move to a new header file? */

#define WL18XX_FW_NAME "ti-connectivity/wl18xx-fw.bin"

#define WL18XX_FW_NAME "ti-connectivity/wl18xx-fw-2.bin"



static int wl18xx_identify_chip(struct wl1271 *wl)

{
@@ -1385,6 +1385,10 @@ static int wl18xx_setup(struct wl1271 *wl) 
	struct wl18xx_priv *priv = wl->priv;

	int ret;



	wl1271_error("driver is in transitional commit (due to fw api"

		     "change) and can't be booted!");

	return -EINVAL;



	wl->rtable = wl18xx_rtable;

	wl->num_tx_desc = WL18XX_NUM_TX_DESCRIPTORS;

	wl->num_rx_desc = WL18XX_NUM_TX_DESCRIPTORS;

drivers/net/wireless/ti/wl18xx/wl18xx.h

+2 −2
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 


/* minimum FW required for driver */

#define WL18XX_CHIP_VER		8

#define WL18XX_IFTYPE_VER	2

#define WL18XX_IFTYPE_VER	5

#define WL18XX_MAJOR_VER	0

#define WL18XX_SUBTYPE_VER	0

#define WL18XX_MINOR_VER	100

#define WL18XX_MINOR_VER	28



#define WL18XX_CMD_MAX_SIZE          740