Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

brcmsmac: get board and chip info from bcma

Browse source 
bcma now provide this data and brcmsmac should get it from there and
not parse it by its self.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Tested-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Hauke Mehrtens 2012-04-29 02:50:27 +02:00 committed by John W. Linville
parent 47671b1a16
commit 1928ad71f2
1 changed files with 5 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
View file

@ -542,27 +542,12 @@ ai_buscore_setup(struct si_info *sii, struct bcma_device *cc)
return true; return true;
} }
/*
* get boardtype and boardrev
*/
static __used void ai_nvram_process(struct si_info *sii)
{
uint w = 0;
/* do a pci config read to get subsystem id and subvendor id */
pci_read_config_dword(sii->pcibus, PCI_SUBSYSTEM_VENDOR_ID, &w);
sii->pub.boardvendor = w & 0xffff;
sii->pub.boardtype = (w >> 16) & 0xffff;
}
static struct si_info *ai_doattach(struct si_info *sii, static struct si_info *ai_doattach(struct si_info *sii,
struct bcma_bus *pbus) struct bcma_bus *pbus)
{ {
struct si_pub *sih = &sii->pub; struct si_pub *sih = &sii->pub;
u32 w, savewin; u32 w, savewin;
struct bcma_device *cc; struct bcma_device *cc;
uint socitype;
struct ssb_sprom *sprom = &pbus->sprom; struct ssb_sprom *sprom = &pbus->sprom;
savewin = 0; savewin = 0;
@ -577,30 +562,15 @@ static struct si_info *ai_doattach(struct si_info *sii,
if (!ai_buscore_prep(sii)) if (!ai_buscore_prep(sii))
return NULL; return NULL;
/* sih->chip = pbus->chipinfo.id;
* ChipID recognition. sih->chiprev = pbus->chipinfo.rev;
* We assume we can read chipid at offset 0 from the regs arg. sih->chippkg = pbus->chipinfo.pkg;
* If we add other chiptypes (or if we need to support old sdio sih->boardvendor = pbus->boardinfo.vendor;
* hosts w/o chipcommon), some way of recognizing them needs to sih->boardtype = pbus->boardinfo.type;
* be added here.
*/
w = bcma_read32(cc, CHIPCREGOFFS(chipid));
socitype = (w & CID_TYPE_MASK) >> CID_TYPE_SHIFT;
/* Might as wll fill in chip id rev & pkg */
sih->chip = w & CID_ID_MASK;
sih->chiprev = (w & CID_REV_MASK) >> CID_REV_SHIFT;
sih->chippkg = (w & CID_PKG_MASK) >> CID_PKG_SHIFT;
/* scan for cores */
if (socitype != SOCI_AI)
return NULL;
SI_MSG("Found chip type AI (0x%08x)\n", w);
if (!ai_buscore_setup(sii, cc)) if (!ai_buscore_setup(sii, cc))
goto exit; goto exit;
ai_nvram_process(sii);
/* === NVRAM, clock is ready === */ /* === NVRAM, clock is ready === */
bcma_write32(cc, CHIPCREGOFFS(gpiopullup), 0); bcma_write32(cc, CHIPCREGOFFS(gpiopullup), 0);
bcma_write32(cc, CHIPCREGOFFS(gpiopulldown), 0); bcma_write32(cc, CHIPCREGOFFS(gpiopulldown), 0);