diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-04-28 20:04:06 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-05-16 12:45:20 -0400 |
commit | 5a20ef3db28faa42dd5dc86ad75d2736bcd3da4c (patch) | |
tree | bc079f5da6e2ec6296c434ec51926545ae6e8db1 /drivers/net/wireless/b43/main.c | |
parent | 12d9568333de3bfc50ff8d3312c097ba7ea7fe3c (diff) |
ssb: remove rev from boardinfo
Previously the rev contained the revision read from the pci config
space and was used as board_rev in the wireless drivers. This is wrong
the board_rev is only fetched from the sprom accordingly to the open
source part of the Broadcom SDK and brcmsmac. This patch removes the
rev from the boardinfo structure and uses the board_rev attribute from
sprom instead. This attribute is filled by PCI, PCMCIA, SDIO and SoC
code.
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>
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
-rw-r--r-- | drivers/net/wireless/b43/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 617afc8211b2..5a39b226b2e3 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -5243,10 +5243,10 @@ static void b43_sprom_fixup(struct ssb_bus *bus) | |||
5243 | 5243 | ||
5244 | /* boardflags workarounds */ | 5244 | /* boardflags workarounds */ |
5245 | if (bus->boardinfo.vendor == SSB_BOARDVENDOR_DELL && | 5245 | if (bus->boardinfo.vendor == SSB_BOARDVENDOR_DELL && |
5246 | bus->chip_id == 0x4301 && bus->boardinfo.rev == 0x74) | 5246 | bus->chip_id == 0x4301 && bus->sprom.board_rev == 0x74) |
5247 | bus->sprom.boardflags_lo |= B43_BFL_BTCOEXIST; | 5247 | bus->sprom.boardflags_lo |= B43_BFL_BTCOEXIST; |
5248 | if (bus->boardinfo.vendor == PCI_VENDOR_ID_APPLE && | 5248 | if (bus->boardinfo.vendor == PCI_VENDOR_ID_APPLE && |
5249 | bus->boardinfo.type == 0x4E && bus->boardinfo.rev > 0x40) | 5249 | bus->boardinfo.type == 0x4E && bus->sprom.board_rev > 0x40) |
5250 | bus->sprom.boardflags_lo |= B43_BFL_PACTRL; | 5250 | bus->sprom.boardflags_lo |= B43_BFL_PACTRL; |
5251 | if (bus->bustype == SSB_BUSTYPE_PCI) { | 5251 | if (bus->bustype == SSB_BUSTYPE_PCI) { |
5252 | pdev = bus->host_pci; | 5252 | pdev = bus->host_pci; |