brcm80211: smac: use bcma core register access functions for 802.11 core

The driver now uses the bcma register access functions to read and
write the registers on the 802.11 core. The dma and phy code need
to be modified next and access to the other cores. That will be done
in coming patches.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
index 43f7a724dda8..90911eec0cf5 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
@@ -1118,14 +1118,17 @@ brcms_c_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb,
                 u8 status_delay = 0;
 
                 /* wait till the next 8 bytes of txstatus is available */
-                while (((s1 = R_REG(&wlc->regs->frmtxstatus)) & TXS_V) == 0) {
+                s1 = bcma_read32(wlc->hw->d11core, D11REGOFFS(frmtxstatus));
+                while ((s1 & TXS_V) == 0) {
                         udelay(1);
                         status_delay++;
                         if (status_delay > 10)
                                 return; /* error condition */
+                        s1 = bcma_read32(wlc->hw->d11core,
+                                         D11REGOFFS(frmtxstatus));
                 }
 
-                s2 = R_REG(&wlc->regs->frmtxstatus2);
+                s2 = bcma_read32(wlc->hw->d11core, D11REGOFFS(frmtxstatus2));
         }
 
         if (scb) {