Commit 20f522ff authored by Manuel Lauss's avatar Manuel Lauss Committed by Pierre Ossman

au1xmmc: SDIO IRQ support.

Wire up the SD controllers' SDIO IRQ capability.
Signed-off-by: default avatarManuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent 281dd23e
...@@ -736,6 +736,9 @@ static irqreturn_t au1xmmc_irq(int irq, void *dev_id) ...@@ -736,6 +736,9 @@ static irqreturn_t au1xmmc_irq(int irq, void *dev_id)
if (!(status & SD_STATUS_I)) if (!(status & SD_STATUS_I))
return IRQ_NONE; /* not ours */ return IRQ_NONE; /* not ours */
if (status & SD_STATUS_SI) /* SDIO */
mmc_signal_sdio_irq(host->mmc);
if (host->mrq && (status & STATUS_TIMEOUT)) { if (host->mrq && (status & STATUS_TIMEOUT)) {
if (status & SD_STATUS_RAT) if (status & SD_STATUS_RAT)
host->mrq->cmd->error = -ETIMEDOUT; host->mrq->cmd->error = -ETIMEDOUT;
...@@ -862,10 +865,21 @@ static void au1xmmc_dbdma_shutdown(struct au1xmmc_host *host) ...@@ -862,10 +865,21 @@ static void au1xmmc_dbdma_shutdown(struct au1xmmc_host *host)
} }
#endif #endif
static void au1xmmc_enable_sdio_irq(struct mmc_host *mmc, int en)
{
struct au1xmmc_host *host = mmc_priv(mmc);
if (en)
IRQ_ON(host, SD_CONFIG_SI);
else
IRQ_OFF(host, SD_CONFIG_SI);
}
static const struct mmc_host_ops au1xmmc_ops = { static const struct mmc_host_ops au1xmmc_ops = {
.request = au1xmmc_request, .request = au1xmmc_request,
.set_ios = au1xmmc_set_ios, .set_ios = au1xmmc_set_ios,
.get_ro = au1xmmc_card_readonly, .get_ro = au1xmmc_card_readonly,
.enable_sdio_irq = au1xmmc_enable_sdio_irq,
}; };
static void au1xmmc_poll_event(unsigned long arg) static void au1xmmc_poll_event(unsigned long arg)
...@@ -964,7 +978,7 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev) ...@@ -964,7 +978,7 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev)
mmc->max_blk_count = 512; mmc->max_blk_count = 512;
mmc->ocr_avail = AU1XMMC_OCR; mmc->ocr_avail = AU1XMMC_OCR;
mmc->caps = MMC_CAP_4_BIT_DATA; mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;
host->status = HOST_S_IDLE; host->status = HOST_S_IDLE;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment