diff options
| -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 e22c3fa3516a..e2c0cc9a0ca6 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) | |||
| 550 | 550 | ||
| 551 | mmc->ops = &tmio_mmc_ops; | 551 | mmc->ops = &tmio_mmc_ops; |
| 552 | mmc->caps = MMC_CAP_4_BIT_DATA; | 552 | mmc->caps = MMC_CAP_4_BIT_DATA; |
| 553 | mmc->caps |= pdata->capabilities; | ||
| 553 | mmc->f_max = pdata->hclk; | 554 | mmc->f_max = pdata->hclk; |
| 554 | mmc->f_min = mmc->f_max / 512; | 555 | mmc->f_min = mmc->f_max / 512; |
| 555 | mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; | 556 | 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 9cb1834deffa..37d941420ce4 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); | |||
| 60 | */ | 60 | */ |
| 61 | struct tmio_mmc_data { | 61 | struct tmio_mmc_data { |
| 62 | const unsigned int hclk; | 62 | const unsigned int hclk; |
| 63 | unsigned long capabilities; | ||
| 63 | void (*set_pwr)(struct platform_device *host, int state); | 64 | void (*set_pwr)(struct platform_device *host, int state); |
| 64 | void (*set_clk_div)(struct platform_device *host, int state); | 65 | void (*set_clk_div)(struct platform_device *host, int state); |
| 65 | }; | 66 | }; |
