From 4c285d4e6a83ff46a3902065de71207055ad7c3c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 8 Sep 2005 22:48:16 +0100 Subject: [PATCH] --- yaml --- r: 7871 b: refs/heads/master c: c26971cbb39727b0b692c6236f890ba13046a663 h: refs/heads/master i: 7869: 6220a0b1330d3b18f6f81111f6baf765d11607f9 7867: 7a506a8d0eb382fbf10dd4ab02e90cb783694d3a 7863: 963d4af0834784ad965c5ff82a711c42f8b0f346 7855: 70556e7b92bf0ddefb20763a0d05e1869eac0912 7839: 81ae656bb59367a46e6ad14979fc48985d34dbc5 7807: 362c2ea99f07bd93336917817fadfd4bdb4e3f6c v: v3 --- [refs] | 2 +- trunk/drivers/mmc/pxamci.c | 4 +++- trunk/include/asm-arm/arch-pxa/mmc.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8812277c7d5c..af1479a001d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01357dcac62ac028de65a1c315eb75c530c8a5d6 +refs/heads/master: c26971cbb39727b0b692c6236f890ba13046a663 diff --git a/trunk/drivers/mmc/pxamci.c b/trunk/drivers/mmc/pxamci.c index 5223cd3bfc1e..b53af57074e3 100644 --- a/trunk/drivers/mmc/pxamci.c +++ b/trunk/drivers/mmc/pxamci.c @@ -423,7 +423,9 @@ static void pxamci_dma_irq(int dma, void *devid, struct pt_regs *regs) static irqreturn_t pxamci_detect_irq(int irq, void *devid, struct pt_regs *regs) { - mmc_detect_change(devid, 0); + struct pxamci_host *host = mmc_priv(devid); + + mmc_detect_change(devid, host->pdata->detect_delay); return IRQ_HANDLED; } diff --git a/trunk/include/asm-arm/arch-pxa/mmc.h b/trunk/include/asm-arm/arch-pxa/mmc.h index 9718063a2119..88c17dd02ed2 100644 --- a/trunk/include/asm-arm/arch-pxa/mmc.h +++ b/trunk/include/asm-arm/arch-pxa/mmc.h @@ -9,6 +9,7 @@ struct mmc_host; struct pxamci_platform_data { unsigned int ocr_mask; /* available voltages */ + unsigned long detect_delay; /* delay in jiffies before detecting cards after interrupt */ int (*init)(struct device *, irqreturn_t (*)(int, void *, struct pt_regs *), void *); int (*get_ro)(struct device *); void (*setpower)(struct device *, unsigned int);