OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f659544
)
b43: bcma: respect GMODE (band choice) during core reset
author
Rafał Miłecki
<zajec5@gmail.com>
Tue, 22 Apr 2014 11:54:35 +0000
(13:54 +0200)
committer
John W. Linville
<linville@tuxdriver.com>
Wed, 30 Apr 2014 16:05:10 +0000
(12:05 -0400)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/b43/main.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/b43/main.c
b/drivers/net/wireless/b43/main.c
index
07024c6
..
f0de7dd
100644
(file)
--- a/
drivers/net/wireless/b43/main.c
+++ b/
drivers/net/wireless/b43/main.c
@@
-1195,8
+1195,13
@@
static void b43_bcma_wireless_core_reset(struct b43_wldev *dev, bool gmode)
B43_BCMA_CLKCTLST_PHY_PLL_REQ;
u32 status = B43_BCMA_CLKCTLST_80211_PLL_ST |
B43_BCMA_CLKCTLST_PHY_PLL_ST;
+ u32 flags;
+
+ flags = B43_BCMA_IOCTL_PHY_CLKEN;
+ if (gmode)
+ flags |= B43_BCMA_IOCTL_GMODE;
+ b43_device_enable(dev, flags);
- b43_device_enable(dev, B43_BCMA_IOCTL_PHY_CLKEN);
bcma_core_set_clockmode(dev->dev->bdev, BCMA_CLKMODE_FAST);
b43_bcma_phy_reset(dev);
bcma_core_pll_ctl(dev->dev->bdev, req, status, true);