tmio_mmc: Add MMC_CAP_MMC_HIGHSPEED support

tmio_mmc: Add MMC_CAP_MMC_HIGHSPEED support

[Yusuke Goda]

Enable MMC_CAP_MMC_HIGHSPEED support in the tmio_mmc driver if
pdata->cap_highspeed is set.

Signed-off-by: Yusuke Goda <goda.yusuke@renesas.com>
---
 drivers/mmc/host/tmio_mmc.c |    2 ++
 include/linux/mfd/tmio.h    |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index e22c3fa..a8ca83f 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -550,6 +550,8 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)

 	mmc->ops = &tmio_mmc_ops;
 	mmc->caps = MMC_CAP_4_BIT_DATA;
+	if (pdata->cap_highspeed)
+		mmc->caps |= MMC_CAP_MMC_HIGHSPEED;
 	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 9cb1834..695199a 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;
+	int 				cap_highspeed;
 	void (*set_pwr)(struct platform_device *host, int state);
 	void (*set_clk_div)(struct platform_device *host, int state);
 };
-- 
1.6.4.3

Re: tmio_mmc: Add MMC_CAP_MMC_HIGHSPEED support

[Magnus Damm]

Hi Goda-san,

2010/2/15 Yusuke Goda <goda.yusuke@renesas.com>:
> Enable MMC_CAP_MMC_HIGHSPEED support in the tmio_mmc driver if
> pdata->cap_highspeed is set.
>
> Signed-off-by: Yusuke Goda <goda.yusuke@renesas.com>

Thanks for your patch, it looks fine to me.
Acked-by: Magnus Damm <damm@opensource.se>

If no one objects then I'll hack up a patch for the sh_mobile_sdhi
driver that sets pdata->cah_highspeed to 1.

Cheers,

/ magnus

Re: tmio_mmc: Add MMC_CAP_MMC_HIGHSPEED support

[Linus Walleij]

2010/2/15 Yusuke Goda <goda.yusuke@renesas.com>:

> diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
> index 9cb1834..695199a 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;
> +       int                             cap_highspeed;

If this is really a bool, then declare it as a bool.

But isn't it better to be able to specify arbitary caps for the platform?
So make this an

unsigned long capabilities;

instead?  Else you will get in trouble the day you want to tag
on something else (like MMC_CAP_SD_HIGHSPEED), and it
doesn't make sense to extend the struct with bools for just about
everything.

Such a change would result in:

> diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
> (...)
>        mmc->caps = MMC_CAP_4_BIT_DATA;
> +       if (pdata->cap_highspeed)
> +               mmc->caps |= MMC_CAP_MMC_HIGHSPEED;

mmc->caps |= pdata->capabilities;

..and then set .capabilities to MMC_CAP_MMC_HIGHSPEED in the
platform data.

Linus

Re: tmio_mmc: Add MMC_CAP_MMC_HIGHSPEED support

[Andrew Morton]

On Mon, 15 Feb 2010 21:15:49 +0900
Magnus Damm <magnus.damm@gmail.com> wrote:

> Hi Goda-san,
> 
> 2010/2/15 Yusuke Goda <goda.yusuke@renesas.com>:
> > Enable MMC_CAP_MMC_HIGHSPEED support in the tmio_mmc driver if
> > pdata->cap_highspeed is set.
> >
> > Signed-off-by: Yusuke Goda <goda.yusuke@renesas.com>
> 
> Thanks for your patch, it looks fine to me.
> Acked-by: Magnus Damm <damm@opensource.se>
> 
> If no one objects then I'll hack up a patch for the sh_mobile_sdhi
> driver that sets pdata->cah_highspeed to 1.
> 

Would prefer to see the interrelated patches in a single series please.

Linus Walleij's suggestion sounded good, too.