b43-dev.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/4] b43: use correct firmware for newer cores
@ 2010-12-21 10:50 Rafał Miłecki
  2010-12-21 10:50 ` [PATCH 2/4] b43: N-PHY: implement radio 2056 init steps Rafał Miłecki
                   ` (3 more replies)
  0 siblings, 4 replies; 9+ messages in thread
From: Rafał Miłecki @ 2010-12-21 10:50 UTC (permalink / raw)
  To: linux-wireless, John W. Linville; +Cc: b43-dev, Rafał Miłecki

Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
---
 drivers/net/wireless/b43/main.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 1aec160..5fb0bc6 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2121,8 +2121,10 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
 		filename = "ucode13";
 	else if (rev == 14)
 		filename = "ucode14";
-	else if (rev >= 15)
+	else if (rev == 15)
 		filename = "ucode15";
+	else if ((rev >= 16) && (rev <= 20))
+		filename = "ucode16_mimo";
 	else
 		goto err_no_ucode;
 	err = b43_do_request_fw(ctx, filename, &fw->ucode);
@@ -2165,7 +2167,9 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
 			goto err_no_initvals;
 		break;
 	case B43_PHYTYPE_N:
-		if ((rev >= 11) && (rev <= 12))
+		if (rev >= 16)
+			filename = "n0initvals16";
+		else if ((rev >= 11) && (rev <= 12))
 			filename = "n0initvals11";
 		else
 			goto err_no_initvals;
@@ -2209,7 +2213,9 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
 			goto err_no_initvals;
 		break;
 	case B43_PHYTYPE_N:
-		if ((rev >= 11) && (rev <= 12))
+		if (rev >= 16)
+			filename = "n0bsinitvals16";
+		else if ((rev >= 11) && (rev <= 12))
 			filename = "n0bsinitvals11";
 		else
 			goto err_no_initvals;
-- 
1.6.3.3

^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2010-12-21 22:33 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-21 10:50 [PATCH 1/4] b43: use correct firmware for newer cores Rafał Miłecki
2010-12-21 10:50 ` [PATCH 2/4] b43: N-PHY: implement radio 2056 init steps Rafał Miłecki
2010-12-21 11:34   ` Michael Büsch
2010-12-21 12:20     ` Rafał Miłecki
2010-12-21 22:25       ` Michael Büsch
2010-12-21 22:33         ` Rafał Miłecki
2010-12-21 10:50 ` [PATCH 3/4] b43: N-PHY: add init tables for 2056 radio Rafał Miłecki
2010-12-21 10:50 ` [PATCH 4/4] b43: N-PHY: avoid PHY hangs for rev 3 and 4 Rafał Miłecki
     [not found] ` <1292948026-472-1-git-send-email-zajec5@gmail.com>
2010-12-21 16:13   ` [PATCH 2/4 V2] b43: N-PHY: implement radio 2056 init steps Rafał Miłecki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).