aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLily Zhang <r58066@freescale.com>2010-03-25 13:08:47 +0800
committerLily Zhang <r58066@freescale.com>2010-03-26 10:33:53 +0800
commitee11693ea22bfb125e31a41d7caa212bca377e18 (patch)
tree740961990b96efa50dc7304ce47751af04420ce2
parent5dc2ae3148c54f37000c4daf1f976d2526bf2263 (diff)
downloadlinux-linaro-ee11693ea22bfb125e31a41d7caa212bca377e18.tar.gz
ENGR00121963-2 SDHC: support "no card detection signal" case
SDHC3 slot in ARM2 CPU board doesn't have card detection signal. For this case, set card state as "PRESENT" always. Please ensure the card is inserted in ARM2 SDHC3 slot if using it. Signed-off-by: Lily Zhang <r58066@freescale.com>
-rw-r--r--drivers/mmc/host/mx_sdhci.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mmc/host/mx_sdhci.c b/drivers/mmc/host/mx_sdhci.c
index 4a6e43c49bc..6f5d5ef84f2 100644
--- a/drivers/mmc/host/mx_sdhci.c
+++ b/drivers/mmc/host/mx_sdhci.c
@@ -1769,7 +1769,10 @@ static int __devinit sdhci_probe_slot(struct platform_device
}
host->detect_irq = platform_get_irq(pdev, 1);
if (!host->detect_irq) {
- host->flags &= ~SDHCI_CD_PRESENT;
+ if (mmc_plat->card_inserted_state)
+ host->flags |= SDHCI_CD_PRESENT;
+ else
+ host->flags &= ~SDHCI_CD_PRESENT;
if ((pdev->id >= 0) && (pdev->id < MXC_SDHCI_NUM))
mxc_fix_chips[pdev->id] = chip;
goto no_detect_irq;