1 files changed, 13 insertions, 4 deletions

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index f7582c096f8d..1e6a2add2aaf 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2685,6 +2685,17 @@ out:
         dev->mac_suspended++;
 }
 
+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/MacPhyClkSet */
+void b43_mac_phy_clock_set(struct b43_wldev *dev, bool on)
+{
+        u32 tmslow = ssb_read32(dev->dev, SSB_TMSLOW);
+        if (on)
+                tmslow |= B43_TMSLOW_MACPHYCLKEN;
+        else
+                tmslow &= ~B43_TMSLOW_MACPHYCLKEN;
+        ssb_write32(dev->dev, SSB_TMSLOW, tmslow);
+}
+
 static void b43_adjust_opmode(struct b43_wldev *dev)
 {
         struct b43_wl *wl = dev->wl;
@@ -2841,7 +2852,7 @@ static int b43_chip_init(struct b43_wldev *dev)
 {
         struct b43_phy *phy = &dev->phy;
         int err;
-        u32 value32, macctl;
+        u32 macctl;
         u16 value16;
 
         /* Initialize the MAC control */
@@ -2919,9 +2930,7 @@ static int b43_chip_init(struct b43_wldev *dev)
         b43_write32(dev, B43_MMIO_DMA4_IRQ_MASK, 0x0000DC00);
         b43_write32(dev, B43_MMIO_DMA5_IRQ_MASK, 0x0000DC00);
 
-        value32 = ssb_read32(dev->dev, SSB_TMSLOW);
-        value32 |= 0x00100000;
-        ssb_write32(dev->dev, SSB_TMSLOW, value32);
+        b43_mac_phy_clock_set(dev, true);
 
         b43_write16(dev, B43_MMIO_POWERUP_DELAY,
                     dev->dev->bus->chipco.fast_pwrup_delay);