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

Commit 870c367c authored by Roger Quadros's avatar Roger Quadros Committed by Luciano Coelho
Browse files

wl1271: Add wl1271_load_firmware() and export some functions 



For the SDIO testing module we need to load the firmware but not
boot it. wl1271_load_firmware() is meant to do just the firmware loading part.

We also export some functions so they are usable in the testing module.

Signed-off-by: default avatarRoger Quadros <roger.quadros@nokia.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
parent 43a598d5

drivers/net/wireless/wl12xx/boot.c

+16 −1
Original line number Diff line number Diff line
@@ -467,7 +467,8 @@ static void wl1271_boot_hw_version(struct wl1271 *wl) 
	wl->hw_pg_ver = (s8)fuse;

}



int wl1271_boot(struct wl1271 *wl)

/* uploads NVS and firmware */

int wl1271_load_firmware(struct wl1271 *wl)

{

	int ret = 0;

	u32 tmp, clk, pause;
@@ -572,6 +573,20 @@ int wl1271_boot(struct wl1271 *wl) 
	if (ret < 0)

		goto out;



out:

	return ret;

}

EXPORT_SYMBOL_GPL(wl1271_load_firmware);



int wl1271_boot(struct wl1271 *wl)

{

	int ret;



	/* upload NVS and firmware */

	ret = wl1271_load_firmware(wl);

	if (ret)

		return ret;



	/* 10.5 start firmware */

	ret = wl1271_boot_run_firmware(wl);

	if (ret < 0)

drivers/net/wireless/wl12xx/boot.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "wl12xx.h"



int wl1271_boot(struct wl1271 *wl);

int wl1271_load_firmware(struct wl1271 *wl);



#define WL1271_NO_SUBBANDS 8

#define WL1271_NO_POWER_LEVELS 4

drivers/net/wireless/wl12xx/io.c

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ int wl1271_set_partition(struct wl1271 *wl, 


	return 0;

}

EXPORT_SYMBOL_GPL(wl1271_set_partition);



void wl1271_io_reset(struct wl1271 *wl)

{