summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLily Zhang <r58066@freescale.com>2010-03-25 13:08:47 +0800
committerAlejandro Gonzalez <alex.gonzalez@digi.com>2010-05-25 11:20:17 +0200
commit966d1e482f39e2730a893470e0862655f306b93f (patch)
tree2b80fb49102a274929a21afff934be759d4bed2c /drivers
parent392cf97ed8ad64813c123a2c63ef96bc2da9c073 (diff)
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> Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'drivers')
-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 ee3a20135359..e8d8fc871e10 100644
--- a/drivers/mmc/host/mx_sdhci.c
+++ b/drivers/mmc/host/mx_sdhci.c
@@ -1780,7 +1780,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;