[PATCH v2] tmio_mmc: Add MMC_CAP_MMC_HIGHSPEED support

[PATCH v2] tmio_mmc: Add MMC_CAP_MMC_HIGHSPEED support

[Yusuke Goda]

Linus, thank you for your advice.


Enable MMC_CAP_XX support in the tmio_mmc driver if
pdata->capabilities is set.


Signed-off-by: Yusuke Goda <goda.yusuke@renesas.com>
---
 drivers/mmc/host/tmio_mmc.c |    1 +
 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 e22c3fa..e2c0cc9 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 9cb1834..37d9414 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);
 };
-- 
1.6.4.3

Re: [PATCH v2] tmio_mmc: Add MMC_CAP_MMC_HIGHSPEED support

[Magnus Damm]

Goda-san,

[CC Ian]

Thanks for your v2 patch. Let's wait and see what Ian thinks. It's a
quite trivial change though so I would be surprised if he had any
objections.

Cheers,

/ magnus

2010/2/16 Yusuke Goda <goda.yusuke@renesas.com>:
> Enable MMC_CAP_XX support in the tmio_mmc driver if
> pdata->capabilities is set.
>
>
> Signed-off-by: Yusuke Goda <goda.yusuke@renesas.com>
> ---
>  drivers/mmc/host/tmio_mmc.c |    1 +
>  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 e22c3fa..e2c0cc9 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 9cb1834..37d9414 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);
>  };
> --
> 1.6.4.3
>
>
>
>