diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-05-05 16:14:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-05 16:14:16 -0400 |
| commit | 83163244f845c296a118ce85c653872dbff6abfe (patch) | |
| tree | ce2eac695a1c198f23d537e20ed86c16ece21f7e /drivers/ssb/sprom.c | |
| parent | 0a12761bcd5646691c5d16dd93df84d1b8849285 (diff) | |
| parent | adfba3c7c026a6a5560d2a43fefc9b198cb74462 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/libertas_tf/cmd.c
drivers/net/wireless/libertas_tf/main.c
Diffstat (limited to 'drivers/ssb/sprom.c')
| -rw-r--r-- | drivers/ssb/sprom.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/ssb/sprom.c b/drivers/ssb/sprom.c index f2f920fef10d..007bc3a03486 100644 --- a/drivers/ssb/sprom.c +++ b/drivers/ssb/sprom.c @@ -176,3 +176,17 @@ const struct ssb_sprom *ssb_get_fallback_sprom(void) { return fallback_sprom; } + +/* http://bcm-v4.sipsolutions.net/802.11/IsSpromAvailable */ +bool ssb_is_sprom_available(struct ssb_bus *bus) +{ + /* status register only exists on chipcomon rev >= 11 and we need check + for >= 31 only */ + /* this routine differs from specs as we do not access SPROM directly + on PCMCIA */ + if (bus->bustype == SSB_BUSTYPE_PCI && + bus->chipco.dev->id.revision >= 31) + return bus->chipco.capabilities & SSB_CHIPCO_CAP_SPROM; + + return true; +} |