aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c')
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
index 654b7e032b27..d4b390c2acfd 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
@@ -425,8 +425,7 @@ brcmf_sdio_chip_buscoreprep(struct brcmf_sdio_dev *sdiodev)
425 425
426 /* Try forcing SDIO core to do ALPAvail request only */ 426 /* Try forcing SDIO core to do ALPAvail request only */
427 clkset = SBSDIO_FORCE_HW_CLKREQ_OFF | SBSDIO_ALP_AVAIL_REQ; 427 clkset = SBSDIO_FORCE_HW_CLKREQ_OFF | SBSDIO_ALP_AVAIL_REQ;
428 brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_1, 428 brcmf_sdio_regwb(sdiodev, SBSDIO_FUNC1_CHIPCLKCSR, clkset, &err);
429 SBSDIO_FUNC1_CHIPCLKCSR, clkset, &err);
430 if (err) { 429 if (err) {
431 brcmf_dbg(ERROR, "error writing for HT off\n"); 430 brcmf_dbg(ERROR, "error writing for HT off\n");
432 return err; 431 return err;
@@ -454,13 +453,11 @@ brcmf_sdio_chip_buscoreprep(struct brcmf_sdio_dev *sdiodev)
454 } 453 }
455 454
456 clkset = SBSDIO_FORCE_HW_CLKREQ_OFF | SBSDIO_FORCE_ALP; 455 clkset = SBSDIO_FORCE_HW_CLKREQ_OFF | SBSDIO_FORCE_ALP;
457 brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_1, 456 brcmf_sdio_regwb(sdiodev, SBSDIO_FUNC1_CHIPCLKCSR, clkset, &err);
458 SBSDIO_FUNC1_CHIPCLKCSR, clkset, &err);
459 udelay(65); 457 udelay(65);
460 458
461 /* Also, disable the extra SDIO pull-ups */ 459 /* Also, disable the extra SDIO pull-ups */
462 brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_1, 460 brcmf_sdio_regwb(sdiodev, SBSDIO_FUNC1_SDIOPULLUP, 0, NULL);
463 SBSDIO_FUNC1_SDIOPULLUP, 0, NULL);
464 461
465 return 0; 462 return 0;
466} 463}