From 81274acce6356ec53208223bc00c39c881a085db Mon Sep 17 00:00:00 2001 From: Yusuke Goda Date: Wed, 17 Feb 2010 16:37:55 +0900 Subject: [PATCH] --- yaml --- r: 186919 b: refs/heads/master c: b741d440a97c376af309e902eeb2f3c5673d2c92 h: refs/heads/master i: 186917: 87d21845e5a1691eab2c1e951126907568f7cff2 186915: ef04409407f89789df73a92c060c19559acf9344 186911: b5a1f54cf1b02c3e48ca62304986d670df4b1941 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/tmio_mmc.c | 1 + trunk/include/linux/mfd/tmio.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7a208979b9a0..13c3241338a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8c39d8deb8341d15fc0eabaa9750f7a1db9d0df +refs/heads/master: b741d440a97c376af309e902eeb2f3c5673d2c92 diff --git a/trunk/drivers/mmc/host/tmio_mmc.c b/trunk/drivers/mmc/host/tmio_mmc.c index e22c3fa3516a..e2c0cc9a0ca6 100644 --- a/trunk/drivers/mmc/host/tmio_mmc.c +++ b/trunk/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/trunk/include/linux/mfd/tmio.h b/trunk/include/linux/mfd/tmio.h index 9cb1834deffa..37d941420ce4 100644 --- a/trunk/include/linux/mfd/tmio.h +++ b/trunk/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); };