|
|
|
@ -100,7 +100,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
|
|
|
|
if (on) {
|
|
|
|
|
/* device WAKEUP through KSO:
|
|
|
|
|
* write bit 0 & read back until
|
|
|
|
|
@@ -2414,6 +2424,14 @@ static int brcmf_sdio_tx_ctrlframe(struc
|
|
|
|
|
@@ -2416,6 +2426,14 @@ static int brcmf_sdio_tx_ctrlframe(struc
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -115,7 +115,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
|
|
|
|
static void brcmf_sdio_bus_stop(struct device *dev)
|
|
|
|
|
{
|
|
|
|
|
struct brcmf_bus *bus_if = dev_get_drvdata(dev);
|
|
|
|
|
@@ -2421,7 +2439,7 @@ static void brcmf_sdio_bus_stop(struct d
|
|
|
|
|
@@ -2423,7 +2441,7 @@ static void brcmf_sdio_bus_stop(struct d
|
|
|
|
|
struct brcmf_sdio *bus = sdiodev->bus;
|
|
|
|
|
struct brcmf_core *core = bus->sdio_core;
|
|
|
|
|
u32 local_hostintmask;
|
|
|
|
@ -124,7 +124,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
|
|
|
|
int err;
|
|
|
|
|
|
|
|
|
|
brcmf_dbg(TRACE, "Enter\n");
|
|
|
|
|
@@ -2448,9 +2466,14 @@ static void brcmf_sdio_bus_stop(struct d
|
|
|
|
|
@@ -2450,9 +2468,14 @@ static void brcmf_sdio_bus_stop(struct d
|
|
|
|
|
/* Force backplane clocks to assure F2 interrupt propagates */
|
|
|
|
|
saveclk = brcmf_sdiod_readb(sdiodev, SBSDIO_FUNC1_CHIPCLKCSR,
|
|
|
|
|
&err);
|
|
|
|
@ -142,7 +142,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
|
|
|
|
if (err)
|
|
|
|
|
brcmf_err("Failed to force clock for F2: err %d\n",
|
|
|
|
|
err);
|
|
|
|
|
@@ -3343,20 +3366,45 @@ err:
|
|
|
|
|
@@ -3345,20 +3368,45 @@ err:
|
|
|
|
|
return bcmerror;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -190,7 +190,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
|
|
|
|
brcmf_sdiod_writeb(bus->sdiodev, SBSDIO_FUNC1_WAKEUPCTRL, val, &err);
|
|
|
|
|
if (err) {
|
|
|
|
|
brcmf_err("error writing SBSDIO_FUNC1_WAKEUPCTRL\n");
|
|
|
|
|
@@ -3365,8 +3413,7 @@ static void brcmf_sdio_sr_init(struct br
|
|
|
|
|
@@ -3367,8 +3415,7 @@ static void brcmf_sdio_sr_init(struct br
|
|
|
|
|
|
|
|
|
|
/* Add CMD14 Support */
|
|
|
|
|
brcmf_sdiod_func0_wb(bus->sdiodev, SDIO_CCCR_BRCM_CARDCAP,
|
|
|
|
@ -200,7 +200,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
|
|
|
|
&err);
|
|
|
|
|
if (err) {
|
|
|
|
|
brcmf_err("error writing SDIO_CCCR_BRCM_CARDCAP\n");
|
|
|
|
|
@@ -3374,7 +3421,7 @@ static void brcmf_sdio_sr_init(struct br
|
|
|
|
|
@@ -3376,7 +3423,7 @@ static void brcmf_sdio_sr_init(struct br
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
brcmf_sdiod_writeb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR,
|
|
|
|
@ -209,7 +209,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
|
|
|
|
if (err) {
|
|
|
|
|
brcmf_err("error writing SBSDIO_FUNC1_CHIPCLKCSR\n");
|
|
|
|
|
return;
|
|
|
|
|
@@ -4065,7 +4112,7 @@ static void brcmf_sdio_firmware_callback
|
|
|
|
|
@@ -4067,7 +4114,7 @@ static void brcmf_sdio_firmware_callback
|
|
|
|
|
const struct firmware *code;
|
|
|
|
|
void *nvram;
|
|
|
|
|
u32 nvram_len;
|
|
|
|
@ -218,7 +218,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
|
|
|
|
u8 devctl;
|
|
|
|
|
|
|
|
|
|
brcmf_dbg(TRACE, "Enter: dev=%s, err=%d\n", dev_name(dev), err);
|
|
|
|
|
@@ -4099,8 +4146,11 @@ static void brcmf_sdio_firmware_callback
|
|
|
|
|
@@ -4101,8 +4148,11 @@ static void brcmf_sdio_firmware_callback
|
|
|
|
|
/* Force clocks on backplane to be sure F2 interrupt propagates */
|
|
|
|
|
saveclk = brcmf_sdiod_readb(sdiod, SBSDIO_FUNC1_CHIPCLKCSR, &err);
|
|
|
|
|
if (!err) {
|
|
|
|
|