diff options
| author | Roger Quadros <roger.quadros@nokia.com> | 2010-11-29 16:24:57 +0200 |
|---|---|---|
| committer | Luciano Coelho <luciano.coelho@nokia.com> | 2010-12-02 16:17:20 +0200 |
| commit | 870c367cf829466f315de785ac613dd94eff5c50 (patch) | |
| tree | e22d1c0f8abc850dc6c603797b379fc189ce571c | |
| parent | 43a598d5e40485fcfbebe0700077e83afd803ed5 (diff) | |
| download | kernel_samsung_smdk4412-870c367cf829466f315de785ac613dd94eff5c50.zip kernel_samsung_smdk4412-870c367cf829466f315de785ac613dd94eff5c50.tar.gz kernel_samsung_smdk4412-870c367cf829466f315de785ac613dd94eff5c50.tar.bz2 | |
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>
| -rw-r--r-- | drivers/net/wireless/wl12xx/boot.c | 17 | ||||
| -rw-r--r-- | drivers/net/wireless/wl12xx/boot.h | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/wl12xx/io.c | 1 |
3 files changed, 18 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/wl12xx/boot.c index 1eafb81..4a9f929 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) diff --git a/drivers/net/wireless/wl12xx/boot.h b/drivers/net/wireless/wl12xx/boot.h index c7d7719..d67dcff 100644 --- a/drivers/net/wireless/wl12xx/boot.h +++ b/drivers/net/wireless/wl12xx/boot.h @@ -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 diff --git a/drivers/net/wireless/wl12xx/io.c b/drivers/net/wireless/wl12xx/io.c index 35c2f1a..d557f73 100644 --- a/drivers/net/wireless/wl12xx/io.c +++ b/drivers/net/wireless/wl12xx/io.c @@ -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) { |