diff options
Diffstat (limited to 'drivers/net/wireless/brcm80211')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c index d8a521ae45da..22913af26db8 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | |||
@@ -687,14 +687,6 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok) | |||
687 | return -EBADE; | 687 | return -EBADE; |
688 | } | 688 | } |
689 | 689 | ||
690 | if (pendok && ((bus->ci->c_inf[1].id == PCMCIA_CORE_ID) | ||
691 | && (bus->ci->c_inf[1].rev == 9))) { | ||
692 | u32 dummy, retries; | ||
693 | r_sdreg32(bus, &dummy, | ||
694 | offsetof(struct sdpcmd_regs, clockctlstatus), | ||
695 | &retries); | ||
696 | } | ||
697 | |||
698 | /* Check current status */ | 690 | /* Check current status */ |
699 | clkctl = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1, | 691 | clkctl = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1, |
700 | SBSDIO_FUNC1_CHIPCLKCSR, &err); | 692 | SBSDIO_FUNC1_CHIPCLKCSR, &err); |
@@ -911,13 +903,6 @@ static int brcmf_sdbrcm_bussleep(struct brcmf_bus *bus, bool sleep) | |||
911 | brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1, | 903 | brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1, |
912 | SBSDIO_FUNC1_CHIPCLKCSR, 0, NULL); | 904 | SBSDIO_FUNC1_CHIPCLKCSR, 0, NULL); |
913 | 905 | ||
914 | /* Force pad isolation off if possible | ||
915 | (in case power never toggled) */ | ||
916 | if ((bus->ci->c_inf[1].id == PCMCIA_CORE_ID) | ||
917 | && (bus->ci->c_inf[1].rev >= 10)) | ||
918 | brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1, | ||
919 | SBSDIO_DEVICE_CTL, 0, NULL); | ||
920 | |||
921 | /* Make sure the controller has the bus up */ | 906 | /* Make sure the controller has the bus up */ |
922 | brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false); | 907 | brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false); |
923 | 908 | ||