commit 15be8e89cdd999124a2307ffd6dacb895c3b802e
author Rafał Miłecki <zajec5@gmail.com> Tue Jul 01 16:33:57 2014 +0200
committer John W. Linville <linville@tuxdriver.com> Tue Jul 01 14:29:39 2014 -0400
tree dec16edc3a47963f4e37608989331e445349b4d9
parent fe255b40cbf0a760b4e62a5948d77aff12b6b0a6

b43: add more bcma cores

This adds some cores with 0x2057 radio which will be supported soon as
well as core 40 that I missed in the earlier firmware patch.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

drivers/net/wireless/b43/main.c

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 3740b76..ca4a190 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -122,7 +122,11 @@
 	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x11, BCMA_ANY_CLASS),
 	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x17, BCMA_ANY_CLASS),
 	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x18, BCMA_ANY_CLASS),
+	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x1C, BCMA_ANY_CLASS),
 	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x1D, BCMA_ANY_CLASS),
+	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x1E, BCMA_ANY_CLASS),
+	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x28, BCMA_ANY_CLASS),
+	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x2A, BCMA_ANY_CLASS),
 	BCMA_CORETABLE_END
 };
 MODULE_DEVICE_TABLE(bcma, b43_bcma_tbl);
@@ -2218,6 +2222,10 @@
 		if (phy->type == B43_PHYTYPE_AC)
 			filename = "ucode42";
 		break;
+	case 40:
+		if (phy->type == B43_PHYTYPE_AC)
+			filename = "ucode40";
+		break;
 	case 33:
 		if (phy->type == B43_PHYTYPE_LCN40)
 			filename = "ucode33_lcn40";
@@ -2343,6 +2351,8 @@
 	case B43_PHYTYPE_AC:
 		if (rev == 42)
 			filename = "ac1initvals42";
+		else if (rev == 40)
+			filename = "ac0initvals40";
 		break;
 	}
 	if (!filename)
@@ -2401,6 +2411,8 @@
 	case B43_PHYTYPE_AC:
 		if (rev == 42)
 			filename = "ac1bsinitvals42";
+		else if (rev == 40)
+			filename = "ac0bsinitvals40";
 		break;
 	}
 	if (!filename)