diff options
| author | Al Cooper <alcooperx@gmail.com> | 2013-05-26 19:59:26 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-05-26 20:23:22 +0200 |
| commit | ad82ab65d8abd060b60d99b8559da99c31515a31 (patch) | |
| tree | aa46094d0345e8f85c18051121186f19949a964d /drivers/mmc | |
| parent | mmc: atmel-mci: add CONFIG_PM_SLEEP to suspend/resume functions (diff) | |
| download | linux-ad82ab65d8abd060b60d99b8559da99c31515a31.tar.xz linux-ad82ab65d8abd060b60d99b8559da99c31515a31.zip | |
mmc: sdhci-pltfm: Allow drivers to set quirks2 from platform data
Signed-off-by: Al Cooper <alcooperx@gmail.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-pltfm.c | 5 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-pltfm.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c index cd0f1f68e261..77821869e66e 100644 --- a/drivers/mmc/host/sdhci-pltfm.c +++ b/drivers/mmc/host/sdhci-pltfm.c @@ -150,8 +150,11 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev, host->ops = pdata->ops; else host->ops = &sdhci_pltfm_ops; - if (pdata) + if (pdata) { host->quirks = pdata->quirks; + host->quirks2 = pdata->quirks2; + } + host->irq = platform_get_irq(pdev, 0); if (!request_mem_region(iomem->start, resource_size(iomem), diff --git a/drivers/mmc/host/sdhci-pltfm.h b/drivers/mmc/host/sdhci-pltfm.h index 1210ed1b0c60..83d42c60a06f 100644 --- a/drivers/mmc/host/sdhci-pltfm.h +++ b/drivers/mmc/host/sdhci-pltfm.h @@ -18,6 +18,7 @@ struct sdhci_pltfm_data { const struct sdhci_ops *ops; unsigned int quirks; + unsigned int quirks2; }; struct sdhci_pltfm_host { |