summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2009-02-20 13:47:56 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2009-02-27 19:52:50 (GMT)
commit1cc8f476f1260758a364b68d299796a9edb9ac41 (patch)
treef5a09937101d63f473e425de7a0dea515bea502c /drivers
parent969d15cfab52c0af40c617fcbcc54cad6eaa4b32 (diff)
downloadlinux-1cc8f476f1260758a364b68d299796a9edb9ac41.tar.xz
b43: Honor the no-slow-clock boardflag
Do not turn off the crystal, if the boardflags tell us so. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/b43/main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 390ce14..3ad3a6c 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4177,6 +4177,8 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
if (phy->radio_rev < 6)
hf |= B43_HF_VCORECALC;
}
+ if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)
+ hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */
b43_hf_write(dev, hf);
b43_set_retry_limits(dev, B43_DEFAULT_SHORT_RETRY_LIMIT,
@@ -4215,7 +4217,7 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
b43_set_synth_pu_delay(dev, 1);
b43_bluetooth_coext_enable(dev);
- ssb_bus_powerup(bus, 1); /* Enable dynamic PCTL */
+ ssb_bus_powerup(bus, !(sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW));
b43_upload_card_macaddress(dev);
b43_security_init(dev);
if (!dev->suspend_in_progress)