From b17b4ab8ce3894744b487e6c880ecea807ed5f86 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 27 Jan 2016 22:25:40 +0000 Subject: [PATCH] mmc: sdhci-iproc: define MMC caps in platform data This patch moves the definition of the MMC capabilities from the probe function into iproc platform data. After that we are able to add support for another platform more easily. Signed-off-by: Stefan Wahren Suggested-by: Stephen Warren Acked-by: Scott Branden Acked-by: Stephen Warren Signed-off-by: Ulf Hansson --- drivers/mmc/host/sdhci-iproc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c index 55bc348ccae0..cdc6c4a0af84 100644 --- a/drivers/mmc/host/sdhci-iproc.c +++ b/drivers/mmc/host/sdhci-iproc.c @@ -26,6 +26,7 @@ struct sdhci_iproc_data { const struct sdhci_pltfm_data *pdata; u32 caps; u32 caps1; + u32 mmc_caps; }; struct sdhci_iproc_host { @@ -165,6 +166,7 @@ static const struct sdhci_iproc_data iproc_data = { .pdata = &sdhci_iproc_pltfm_data, .caps = 0x05E90000, .caps1 = 0x00000064, + .mmc_caps = MMC_CAP_1_8V_DDR, }; static const struct of_device_id sdhci_iproc_of_match[] = { @@ -199,8 +201,7 @@ static int sdhci_iproc_probe(struct platform_device *pdev) mmc_of_parse(host->mmc); sdhci_get_of_property(pdev); - /* Enable EMMC 1/8V DDR capable */ - host->mmc->caps |= MMC_CAP_1_8V_DDR; + host->mmc->caps |= iproc_host->data->mmc_caps; pltfm_host->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(pltfm_host->clk)) { -- 2.20.1