diff options
| author | Roger Quadros <roger.quadros@nokia.com> | 2010-11-29 15:24:57 +0100 |
|---|---|---|
| committer | Luciano Coelho <luciano.coelho@nokia.com> | 2010-12-02 15:17:20 +0100 |
| commit | 870c367cf829466f315de785ac613dd94eff5c50 (patch) | |
| tree | e22d1c0f8abc850dc6c603797b379fc189ce571c /drivers/net/wireless/wl12xx/boot.c | |
| parent | wl12xx: fix illegal memset if debugfs is not enabled (diff) | |
| download | linux-870c367cf829466f315de785ac613dd94eff5c50.tar.xz linux-870c367cf829466f315de785ac613dd94eff5c50.zip | |
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: Roger Quadros <roger.quadros@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/boot.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/boot.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/wl12xx/boot.c index 1eafb8175832..4a9f929725fd 100644 --- a/drivers/net/wireless/wl12xx/boot.c +++ b/drivers/net/wireless/wl12xx/boot.c @@ -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) |