diff options
| author | Jaehoon Chung <jh80.chung@samsung.com> | 2012-02-07 15:59:01 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-10 23:40:32 -0800 |
| commit | c1c4b66dc010bb69456f7f7c25442772bbe54dbd (patch) | |
| tree | 61710c1f5c6fa59706c73c456e87522b8462bdf4 | |
| parent | 25419010a83e314d10b008aed86a198e07fa9487 (diff) | |
| download | linux-3.10-c1c4b66dc010bb69456f7f7c25442772bbe54dbd.tar.gz linux-3.10-c1c4b66dc010bb69456f7f7c25442772bbe54dbd.tar.bz2 linux-3.10-c1c4b66dc010bb69456f7f7c25442772bbe54dbd.zip | |
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 <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| -rw-r--r-- | drivers/mmc/host/sdhci-s3c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index 1af756ee0f9..b19e7d435f8 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -518,9 +518,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; - if (pdata->pm_caps) host->mmc->pm_caps |= pdata->pm_caps; @@ -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"); |