Skip to content

Commit

Permalink
mmc: sdhci-iproc: define MMC caps in platform data
Browse files Browse the repository at this point in the history
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 <stefan.wahren@i2se.com>
Suggested-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Scott Branden <sbranden@broadcom.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  • Loading branch information
Stefan Wahren authored and Ulf Hansson committed Feb 29, 2016
1 parent 1ac109d commit b17b4ab
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/mmc/host/sdhci-iproc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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[] = {
Expand Down Expand Up @@ -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)) {
Expand Down

0 comments on commit b17b4ab

Please sign in to comment.