]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
au1xmmc: SDIO IRQ support.
authorManuel Lauss <mano@roarinelk.homelinux.net>
Mon, 9 Jun 2008 06:38:03 +0000 (08:38 +0200)
committerPierre Ossman <drzeus@drzeus.cx>
Tue, 15 Jul 2008 12:14:43 +0000 (14:14 +0200)
Wire up the SD controllers' SDIO IRQ capability.

Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
drivers/mmc/host/au1xmmc.c

index 2bd4cf427093bc2a5eac988f01611cb6da00b842..16b5640d826ea287281715d882fe4a847921ca31 100644 (file)
@@ -736,6 +736,9 @@ static irqreturn_t au1xmmc_irq(int irq, void *dev_id)
        if (!(status & SD_STATUS_I))
                return IRQ_NONE;        /* not ours */
 
+       if (status & SD_STATUS_SI)      /* SDIO */
+               mmc_signal_sdio_irq(host->mmc);
+
        if (host->mrq && (status & STATUS_TIMEOUT)) {
                if (status & SD_STATUS_RAT)
                        host->mrq->cmd->error = -ETIMEDOUT;
@@ -862,10 +865,21 @@ static void au1xmmc_dbdma_shutdown(struct au1xmmc_host *host)
 }
 #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 = {
        .request        = au1xmmc_request,
        .set_ios        = au1xmmc_set_ios,
        .get_ro         = au1xmmc_card_readonly,
+       .enable_sdio_irq = au1xmmc_enable_sdio_irq,
 };
 
 static void au1xmmc_poll_event(unsigned long arg)
@@ -964,7 +978,7 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev)
        mmc->max_blk_count = 512;
 
        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;