lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wl1271: Add wl1271_load_firmware() and export some functions

Browse Source 
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: Roger Quadros <roger.quadros@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
This commit is contained in:
Roger Quadros
2010-11-29 16:24:57 +02:00
committed by Luciano Coelho
parent 43a598d5e4
commit 870c367cf8
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/wireless/wl12xx/boot.c
View File

@@ -467,7 +467,8 @@ static void wl1271_boot_hw_version(struct wl1271 *wl)
wl->hw_pg_ver = (s8)fuse; 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; int ret = 0;
u32 tmp, clk, pause; u32 tmp, clk, pause;
@@ -572,6 +573,20 @@ int wl1271_boot(struct wl1271 *wl)
if (ret < 0) if (ret < 0)
goto out; 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 */ /* 10.5 start firmware */
ret = wl1271_boot_run_firmware(wl); ret = wl1271_boot_run_firmware(wl);
if (ret < 0) if (ret < 0)

1
drivers/net/wireless/wl12xx/boot.h
View File

@@ -27,6 +27,7 @@
#include "wl12xx.h" #include "wl12xx.h"
int wl1271_boot(struct wl1271 *wl); int wl1271_boot(struct wl1271 *wl);
int wl1271_load_firmware(struct wl1271 *wl);
#define WL1271_NO_SUBBANDS 8 #define WL1271_NO_SUBBANDS 8
#define WL1271_NO_POWER_LEVELS 4 #define WL1271_NO_POWER_LEVELS 4

1
drivers/net/wireless/wl12xx/io.c
View File

@@ -113,6 +113,7 @@ int wl1271_set_partition(struct wl1271 *wl,
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(wl1271_set_partition);
void wl1271_io_reset(struct wl1271 *wl) void wl1271_io_reset(struct wl1271 *wl)
{ {