SDHCI_QUIRK_BROKEN_CARD_DETECTION is used to disable host internal card detection method. So it should be set for all card detection types except S3C_SDHCI_CD_INTERNAL, or host internal card detection interrupts will be redundantly enabled. So, the 1st change of this patch expands such flag setting. Moreover, we need move further after the above change. In the current code logic, sdhci_add_host() will enable the polling method (set MMC_CAP_NEEDS_POLL) for a removable card (MMC_CAP_NONREMOVABLE is not set) whose host's internal card detection method is disabled. Apparently, this is arbitrary since we can have some other detection types. As a result, sdhci_add_host() will redundantly enable polling for a card with S3C_SDHCI_CD_GPIO/S3C_SDHCI_CD_EXTERNAL type. So, we plan to remove such improper setting in sdhci_add_host(). But before this, this 2nd change of this patch is a MUST, which enables polling in host driver itself for S3C_SDHCI_CD_NONE type. Currently, we rely on the above improper logic for this. Change-Id: I28bd6765e6c6a9dd6c288ff4ca6ecf7268a2d8ed Signed-off-by: yongd <yongd@xxxxxxxxxxx> --- drivers/mmc/host/sdhci-s3c.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index a093e2e..a669616 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -683,10 +683,12 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) /* Samsung SoCs need BROKEN_ADMA_ZEROLEN_DESC */ host->quirks |= SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC; - if (pdata->cd_type == S3C_SDHCI_CD_NONE || - pdata->cd_type == S3C_SDHCI_CD_PERMANENT) + if (pdata->cd_type != S3C_SDHCI_CD_INTERNAL) host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; + if (pdata->cd_type == S3C_SDHCI_CD_NONE) + host->mmc->caps = MMC_CAP_NEEDS_POLL; + if (pdata->cd_type == S3C_SDHCI_CD_PERMANENT) host->mmc->caps = MMC_CAP_NONREMOVABLE; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
