aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/wl12xx/boot.c17
-rw-r--r--drivers/net/wireless/wl12xx/boot.h1
-rw-r--r--drivers/net/wireless/wl12xx/io.c1
3 files changed, 18 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/wl12xx/boot.c
index 1eafb817583..4a9f929725f 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)
467 wl->hw_pg_ver = (s8)fuse; 467 wl->hw_pg_ver = (s8)fuse;
468} 468}
469 469
470int wl1271_boot(struct wl1271 *wl) 470/* uploads NVS and firmware */
471int wl1271_load_firmware(struct wl1271 *wl)
471{ 472{
472 int ret = 0; 473 int ret = 0;
473 u32 tmp, clk, pause; 474 u32 tmp, clk, pause;
@@ -572,6 +573,20 @@ int wl1271_boot(struct wl1271 *wl)
572 if (ret < 0) 573 if (ret < 0)
573 goto out; 574 goto out;
574 575
576out:
577 return ret;
578}
579EXPORT_SYMBOL_GPL(wl1271_load_firmware);
580
581int wl1271_boot(struct wl1271 *wl)
582{
583 int ret;
584
585 /* upload NVS and firmware */
586 ret = wl1271_load_firmware(wl);
587 if (ret)
588 return ret;
589
575 /* 10.5 start firmware */ 590 /* 10.5 start firmware */
576 ret = wl1271_boot_run_firmware(wl); 591 ret = wl1271_boot_run_firmware(wl);
577 if (ret < 0) 592 if (ret < 0)
diff --git a/drivers/net/wireless/wl12xx/boot.h b/drivers/net/wireless/wl12xx/boot.h
index c7d771959f3..d67dcffa31e 100644
--- a/drivers/net/wireless/wl12xx/boot.h
+++ b/drivers/net/wireless/wl12xx/boot.h
@@ -27,6 +27,7 @@
27#include "wl12xx.h" 27#include "wl12xx.h"
28 28
29int wl1271_boot(struct wl1271 *wl); 29int wl1271_boot(struct wl1271 *wl);
30int wl1271_load_firmware(struct wl1271 *wl);
30 31
31#define WL1271_NO_SUBBANDS 8 32#define WL1271_NO_SUBBANDS 8
32#define WL1271_NO_POWER_LEVELS 4 33#define WL1271_NO_POWER_LEVELS 4
diff --git a/drivers/net/wireless/wl12xx/io.c b/drivers/net/wireless/wl12xx/io.c
index 35c2f1aca6b..d557f73e7c1 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,
113 113
114 return 0; 114 return 0;
115} 115}
116EXPORT_SYMBOL_GPL(wl1271_set_partition);
116 117
117void wl1271_io_reset(struct wl1271 *wl) 118void wl1271_io_reset(struct wl1271 *wl)
118{ 119{