ssb: update list of devices supporting multiple 80211 cores

Some of the BCM43xx chips contain cores that are attached to the SSB, but are
inactive as they do not connect to the external environment. These must not be
registered. Several of these types are handled in driver ssb; however, the
specific case of an inactive 802.11 cores is now treated in b43 and b43legacy.
Although the current setup works, this minor change will place all such
workarounds in ssb, and simplify the code in drivers b43 and b43legacy.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Tested-by: Larry Finger <Larry.Finger@lwfinger.net>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c
index 7dca719fbcfb144da2a81bcfa7a32996bbd32090..45e5babd3961110982c7c44e2ae4d988e4f86652 100644 (file)
--- a/drivers/ssb/scan.c
+++ b/drivers/ssb/scan.c
@@ -258,7 +258,10 @@ static int we_support_multiple_80211_cores(struct ssb_bus *bus)
 #ifdef CONFIG_SSB_PCIHOST
        if (bus->bustype == SSB_BUSTYPE_PCI) {
                if (bus->host_pci->vendor == PCI_VENDOR_ID_BROADCOM &&
-                   bus->host_pci->device == 0x4324)
+                   ((bus->host_pci->device == 0x4313) ||
+                    (bus->host_pci->device == 0x431A) ||
+                    (bus->host_pci->device == 0x4321) ||
+                    (bus->host_pci->device == 0x4324)))
                        return 1;
        }
 #endif /* CONFIG_SSB_PCIHOST */