Skip to content

Commit

Permalink
mmc: sdhci-s3c: add platform data for the second capability
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jaehoon Chung authored and Kukjin Kim committed Mar 11, 2012
1 parent 2541901 commit c1c4b66
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/mmc/host/sdhci-s3c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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");
Expand Down

0 comments on commit c1c4b66

Please sign in to comment.