openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

brcmfmac: decouple set_sbaddr_window from register write interface 

brcmf_sdcard_set_sbaddr_window configures 3 registers on SDIO
function misc bank to change current silicon backplane programming
window. This patch makes it call brcmf_sdioh_request_byte directly
in order to prepare for the write register interface unification.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Franky Lin 2012-05-04 18:27:30 -07:00 committed by John W. Linville
parent ce454e8828
commit 7d9cfc2826
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
View File

@ -205,19 +205,30 @@ brcmf_sdcard_cfg_write(struct brcmf_sdio_dev *sdiodev, uint fnc_num, u32 addr,
int int
brcmf_sdcard_set_sbaddr_window(struct brcmf_sdio_dev *sdiodev, u32 address) brcmf_sdcard_set_sbaddr_window(struct brcmf_sdio_dev *sdiodev, u32 address)
{ {
int err = 0; int err = 0, i;
brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_1, SBSDIO_FUNC1_SBADDRLOW, u8 addr[3];
(address >> 8) & SBSDIO_SBADDRLOW_MASK, &err); s32 retry;
if (!err)
brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_1, addr[0] = (address >> 8) & SBSDIO_SBADDRLOW_MASK;
SBSDIO_FUNC1_SBADDRMID, addr[1] = (address >> 16) & SBSDIO_SBADDRMID_MASK;
(address >> 16) & SBSDIO_SBADDRMID_MASK, addr[2] = (address >> 24) & SBSDIO_SBADDRHIGH_MASK;
&err);
if (!err) for (i = 0; i < 3; i++) {
brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_1, retry = 0;
SBSDIO_FUNC1_SBADDRHIGH, do {
(address >> 24) & SBSDIO_SBADDRHIGH_MASK, if (retry)
&err); usleep_range(1000, 2000);
err = brcmf_sdioh_request_byte(sdiodev, SDIOH_WRITE,
SDIO_FUNC_1, SBSDIO_FUNC1_SBADDRLOW + i,
&addr[i]);
} while (err != 0 && retry++ < SDIOH_API_ACCESS_RETRY_LIMIT);
if (err) {
brcmf_dbg(ERROR, "failed at addr:0x%0x\n",
SBSDIO_FUNC1_SBADDRLOW + i);
break;
}
}
return err; return err;
} }