aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/b43/main.c
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2011-05-17 12:57:28 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-05-19 13:54:09 -0400
commit1495298ddd496131b8226a837ab10bdd5acb3480 (patch)
tree41dcad89dd97b45cd9f410016ee0cd96283052ca /drivers/net/wireless/b43/main.c
parentc4a2a08165dd5a58e24eb342902839dca78887b8 (diff)
b43: separate ssb core reset
Signed-off-by: Rafał Miłecki <zajec5@gmail.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.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 7b3b3f743825..1bc40eb3e49a 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1143,10 +1143,9 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags)
1143 } 1143 }
1144} 1144}
1145 1145
1146void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags) 1146static void b43_ssb_wireless_core_reset(struct b43_wldev *dev, u32 flags)
1147{ 1147{
1148 u32 tmslow; 1148 u32 tmslow;
1149 u32 macctl;
1150 1149
1151 flags |= B43_TMSLOW_PHYCLKEN; 1150 flags |= B43_TMSLOW_PHYCLKEN;
1152 flags |= B43_TMSLOW_PHYRESET; 1151 flags |= B43_TMSLOW_PHYRESET;
@@ -1166,6 +1165,13 @@ void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags)
1166 ssb_write32(dev->sdev, SSB_TMSLOW, tmslow); 1165 ssb_write32(dev->sdev, SSB_TMSLOW, tmslow);
1167 ssb_read32(dev->sdev, SSB_TMSLOW); /* flush */ 1166 ssb_read32(dev->sdev, SSB_TMSLOW); /* flush */
1168 msleep(1); 1167 msleep(1);
1168}
1169
1170void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags)
1171{
1172 u32 macctl;
1173
1174 b43_ssb_wireless_core_reset(dev, flags);
1169 1175
1170 /* Turn Analog ON, but only if we already know the PHY-type. 1176 /* Turn Analog ON, but only if we already know the PHY-type.
1171 * This protects against very early setup where we don't know the 1177 * This protects against very early setup where we don't know the