diff options
| author | Yusuke Goda <goda.yusuke@renesas.com> | 2010-02-17 16:37:55 +0900 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-03-07 22:17:26 +0100 |
| commit | b741d440a97c376af309e902eeb2f3c5673d2c92 (patch) | |
| tree | 9dd347f1252567a4b0695051d81b11b24317ecbf | |
| parent | a8c39d8deb8341d15fc0eabaa9750f7a1db9d0df (diff) | |
| download | linux-3.10-b741d440a97c376af309e902eeb2f3c5673d2c92.tar.gz linux-3.10-b741d440a97c376af309e902eeb2f3c5673d2c92.tar.bz2 linux-3.10-b741d440a97c376af309e902eeb2f3c5673d2c92.zip | |
tmio_mmc: Add MMC_CAP_MMC_HIGHSPEED support V2
Enable MMC_CAP_XX support in the tmio_mmc driver if
pdata->capabilities is set.
Signed-off-by: Yusuke Goda <goda.yusuke@renesas.com>
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| -rw-r--r-- | drivers/mmc/host/tmio_mmc.c | 1 | ||||
| -rw-r--r-- | include/linux/mfd/tmio.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c index e22c3fa3516..e2c0cc9a0ca 100644 --- a/drivers/mmc/host/tmio_mmc.c +++ b/drivers/mmc/host/tmio_mmc.c @@ -550,6 +550,7 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev) mmc->ops = &tmio_mmc_ops; mmc->caps = MMC_CAP_4_BIT_DATA; + mmc->caps |= pdata->capabilities; mmc->f_max = pdata->hclk; mmc->f_min = mmc->f_max / 512; mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index 9cb1834deff..37d941420ce 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -60,6 +60,7 @@ void tmio_core_mmc_clk_div(void __iomem *cnf, int shift, int state); */ struct tmio_mmc_data { const unsigned int hclk; + unsigned long capabilities; void (*set_pwr)(struct platform_device *host, int state); void (*set_clk_div)(struct platform_device *host, int state); }; |