diff options
author | Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2009-10-12 08:08:46 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-10-27 16:48:03 -0400 |
commit | 451de97adb4d0f101f3befc881a548adb47c467a (patch) | |
tree | 6d40eb04db29f66983a6dd98e8bfff7eb654935b /drivers/net/wireless/wl12xx/wl1271_main.c | |
parent | 37079a831d8194e138c03663b7cab281ab1dc181 (diff) |
wl1271: Update memory mapping for firmware revision 6.1.0.0.241
Update the memory regions and memory mapping to support firmware revision
6.1.0.0.241.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_main.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index b9f20918a25d..22d44ba2e969 100644 --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c | |||
@@ -315,6 +315,7 @@ static int wl1271_setup(struct wl1271 *wl) | |||
315 | 315 | ||
316 | static int wl1271_chip_wakeup(struct wl1271 *wl) | 316 | static int wl1271_chip_wakeup(struct wl1271 *wl) |
317 | { | 317 | { |
318 | struct wl1271_partition_set partition; | ||
318 | int ret = 0; | 319 | int ret = 0; |
319 | 320 | ||
320 | wl1271_power_on(wl); | 321 | wl1271_power_on(wl); |
@@ -324,11 +325,10 @@ static int wl1271_chip_wakeup(struct wl1271 *wl) | |||
324 | 325 | ||
325 | /* We don't need a real memory partition here, because we only want | 326 | /* We don't need a real memory partition here, because we only want |
326 | * to use the registers at this point. */ | 327 | * to use the registers at this point. */ |
327 | wl1271_set_partition(wl, | 328 | memset(&partition, 0, sizeof(partition)); |
328 | 0x00000000, | 329 | partition.reg.start = REGISTERS_BASE; |
329 | 0x00000000, | 330 | partition.reg.size = REGISTERS_DOWN_SIZE; |
330 | REGISTERS_BASE, | 331 | wl1271_set_partition(wl, &partition); |
331 | REGISTERS_DOWN_SIZE); | ||
332 | 332 | ||
333 | /* ELP module wake up */ | 333 | /* ELP module wake up */ |
334 | wl1271_fw_wakeup(wl); | 334 | wl1271_fw_wakeup(wl); |