2010-11-30 19:51:53

by Luciano Coelho

Subject: [PATCH] wl1271: Add wl1271_load_firmware() and export some functions

From: Roger Quadros <[email protected]>

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 <[email protected]>
Signed-off-by: Luciano Coelho <[email protected]>
---
drivers/net/wireless/wl12xx/boot.c | 17 ++++++++++++++++-
drivers/net/wireless/wl12xx/boot.h | 1 +
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)
{
--
1.7.0.4

2010-12-02 14:37:28

by Luciano Coelho

Subject: Re: [PATCH] wl1271: Add wl1271_load_firmware() and export some functions

On Tue, 2010-11-30 at 21:52 +0200, [email protected] wrote:
> From: Roger Quadros <[email protected]>
>
> 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 <[email protected]>
> Signed-off-by: Luciano Coelho <[email protected]>
> ---

Applied and pushed to wl12xx.


--
Cheers,
Luca.