diff options
| author | Sebastien Jan <s-jan@ti.com> | 2011-10-17 11:07:18 +0200 |
|---|---|---|
| committer | Sebastien Jan <s-jan@ti.com> | 2011-10-17 14:50:00 +0200 |
| commit | e1cb7287b576d364722a89363c29e3c5a02455bd (patch) | |
| tree | ad26515e81f54d891b36c2995fff4c2f1e2dbe4b | |
| parent | 9dfae9773ee4c046794b3eda879abe165936e943 (diff) | |
WL12XX: fix nvs filename for 1283 device
Signed-off-by: Sebastien Jan <s-jan@ti.com>
| -rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 7 | ||||
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl12xx.h | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index e6497dc669df..a296bc5a0b35 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -947,7 +947,12 @@ static int wl1271_fetch_nvs(struct wl1271 *wl) const struct firmware *fw; int ret; - ret = request_firmware(&fw, WL12XX_NVS_NAME, wl1271_wl_to_dev(wl)); + if (wl->chip.id == CHIP_ID_1283_PG20) { + wl1271_notice("1283 chip detected, adapting nvs filename"); + ret = request_firmware(&fw, WL128X_NVS_NAME, wl1271_wl_to_dev(wl)); + } else { + ret = request_firmware(&fw, WL12XX_NVS_NAME, wl1271_wl_to_dev(wl)); + } if (ret < 0) { wl1271_error("could not get nvs file: %d", ret); diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h index fbe8f46d1232..fa2057110d7d 100644 --- a/drivers/net/wireless/wl12xx/wl12xx.h +++ b/drivers/net/wireless/wl12xx/wl12xx.h @@ -141,6 +141,7 @@ extern u32 wl12xx_debug_level; * the correct NVS size in wl1271_boot_upload_nvs(). */ #define WL12XX_NVS_NAME "ti-connectivity/wl1271-nvs.bin" +#define WL128X_NVS_NAME "ti-connectivity/wl128x-nvs.bin" #define WL1271_TX_SECURITY_LO16(s) ((u16)((s) & 0xffff)) #define WL1271_TX_SECURITY_HI32(s) ((u32)(((s) >> 16) & 0xffffffff)) |