diff options
| author | Kevin Liu <kliu5@marvell.com> | 2013-03-25 17:42:57 +0800 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-04-04 09:58:20 -0400 |
| commit | c844a46f135e493ffda0bd770e16f6c3dd6c7eb7 (patch) | |
| tree | 1bbd0e765f6cde831b85c76187931423b3ea2d8b /drivers/mmc | |
| parent | 73b7afb9764b77fca99d515b8d9cbeeaae5fe55c (diff) | |
| download | linux-stable-c844a46f135e493ffda0bd770e16f6c3dd6c7eb7.tar.gz linux-stable-c844a46f135e493ffda0bd770e16f6c3dd6c7eb7.tar.bz2 linux-stable-c844a46f135e493ffda0bd770e16f6c3dd6c7eb7.zip | |
mmc: sdhci-pxav3: remove cd-broken quirk for permanently present card
Flag PXA_FLAG_CARD_PERMANENT is set in sdhci_pxa_platdata flags to
indicate that the card is always wired to host, like on-chip emmc,
which is permanently present and don't need detection.
So only MMC_CAP_NONREMOVABLE should be set for this case. But current
code also sets SDHCI_QUIRK_BROKEN_CARD_DETECTION, which doesn't make
sense.
Signed-off-by: Kevin Liu <kliu5@marvell.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-pxav3.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index 14437fc17d83..56d6a2e3194f 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -268,11 +268,9 @@ static int sdhci_pxav3_probe(struct platform_device *pdev) pdata = pxav3_get_mmc_pdata(dev); if (pdata) { - if (pdata->flags & PXA_FLAG_CARD_PERMANENT) { - /* on-chip device */ - host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; + /* on-chip device */ + if (pdata->flags & PXA_FLAG_CARD_PERMANENT) host->mmc->caps |= MMC_CAP_NONREMOVABLE; - } /* If slot design supports 8 bit data, indicate this to MMC. */ if (pdata->flags & PXA_FLAG_SD_8_BIT_CAPABLE_SLOT) |