mmc: sdhci-s3c: add platform data for the second capability

PATCH Superseded Jaehoon Chung 1 participant 1 message Nov 3, 2011

Subsystems (4)

Arm Samsung Exynos MMC, SD and SDIO Secure digital host controller interface (SDHCI) driver Secure digital host controller interface (SDHCI) Samsung driver

lore

Share & tools

lore

Jaehoon Chung

author maintainer

2011-11-03 02:35 UTC #0 lore raw

PATCH v2 2/2 mmc: sdhci-s3c: add platform data for the second capability

This patch is added host_caps2 in sdhci-s3c.c It's necessary that use the second capabilities. And removed the duplicated host_caps.

Signed-off-by Jaehoon Chung <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

---
Changelog v2:
- remove the duplicated host_caps.

 drivers/mmc/host/sdhci-s3c.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

drivers/mmc/host/sdhci-s3c.c +3 -3

index 3d00e72..6b8f8f6 100644
@@ -521,9 +521,6 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
 	if (pdata->cd_type == S3C_SDHCI_CD_PERMANENT)
 		host->mmc->caps = MMC_CAP_NONREMOVABLE;
 
-	if (pdata->host_caps)
-		host->mmc->caps |= pdata->host_caps;
-
 	host->quirks |= (SDHCI_QUIRK_32BIT_DMA_ADDR |
 			 SDHCI_QUIRK_32BIT_DMA_SIZE);

@@ -544,6 +541,9 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
 	if (pdata->host_caps)
 		host->mmc->caps |= pdata->host_caps;
 
+	if (pdata->host_caps2)
+		host->mmc->caps2 |= pdata->host_caps2;
+
 	ret = sdhci_add_host(host);
 	if (ret) {
 		dev_err(dev, "sdhci_add_host() failed\n");