diff mbox

mmc: tmio: don't overwrite caps2

Message ID 87mwkz8p4k.wl%kuninori.morimoto.gx@renesas.com (mailing list archive)
State New, archived
Headers show

Commit Message

Kuninori Morimoto Nov. 20, 2013, 8:16 a.m. UTC 
02cb3221d5bb351ad9f7469453dcca7594a0fabf
(mmc: tmio: support caps2 flags) added caps2 support
on tmio, but it overwrites mmc_of_parse() settings.
This patch fixes it up

Acked-by: Laurent <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
>> Chris

This was part of "SDHI support for r8a7790" patch-set,
but was separated

 drivers/mmc/host/tmio_mmc_pio.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Chris Ball Nov. 26, 2013, 10:21 p.m. UTC | #1 
Hi,

On Wed, Nov 20 2013, Kuninori Morimoto wrote:
> 02cb3221d5bb351ad9f7469453dcca7594a0fabf
> (mmc: tmio: support caps2 flags) added caps2 support
> on tmio, but it overwrites mmc_of_parse() settings.
> This patch fixes it up
>
> Acked-by: Laurent <laurent.pinchart@ideasonboard.com>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
>>> Chris
>
> This was part of "SDHI support for r8a7790" patch-set,
> but was separated
>
>  drivers/mmc/host/tmio_mmc_pio.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
> index 99f6d29..1f5f2ba 100644
> --- a/drivers/mmc/host/tmio_mmc_pio.c
> +++ b/drivers/mmc/host/tmio_mmc_pio.c
> @@ -1021,7 +1021,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host **host,
>  
>  	mmc->ops = &tmio_mmc_ops;
>  	mmc->caps |= MMC_CAP_4_BIT_DATA | pdata->capabilities;
> -	mmc->caps2 = pdata->capabilities2;
> +	mmc->caps2 |= pdata->capabilities2;
>  	mmc->max_segs = 32;
>  	mmc->max_blk_size = 512;
>  	mmc->max_blk_count = (PAGE_CACHE_SIZE / mmc->max_blk_size) *

Thanks, pushed to mmc-next for 3.14.

- Chris.
Kuninori Morimoto Dec. 10, 2013, 2:57 a.m. UTC | #2 
Hi Chris

ping ?

> 02cb3221d5bb351ad9f7469453dcca7594a0fabf
> (mmc: tmio: support caps2 flags) added caps2 support
> on tmio, but it overwrites mmc_of_parse() settings.
> This patch fixes it up
> 
> Acked-by: Laurent <laurent.pinchart@ideasonboard.com>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> >> Chris
> 
> This was part of "SDHI support for r8a7790" patch-set,
> but was separated
> 
>  drivers/mmc/host/tmio_mmc_pio.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
> index 99f6d29..1f5f2ba 100644
> --- a/drivers/mmc/host/tmio_mmc_pio.c
> +++ b/drivers/mmc/host/tmio_mmc_pio.c
> @@ -1021,7 +1021,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host **host,
>  
>  	mmc->ops = &tmio_mmc_ops;
>  	mmc->caps |= MMC_CAP_4_BIT_DATA | pdata->capabilities;
> -	mmc->caps2 = pdata->capabilities2;
> +	mmc->caps2 |= pdata->capabilities2;
>  	mmc->max_segs = 32;
>  	mmc->max_blk_size = 512;
>  	mmc->max_blk_count = (PAGE_CACHE_SIZE / mmc->max_blk_size) *
> -- 
> 1.7.9.5
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index 99f6d29..1f5f2ba 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -1021,7 +1021,7 @@  int tmio_mmc_host_probe(struct tmio_mmc_host **host,
 
 	mmc->ops = &tmio_mmc_ops;
 	mmc->caps |= MMC_CAP_4_BIT_DATA | pdata->capabilities;
-	mmc->caps2 = pdata->capabilities2;
+	mmc->caps2 |= pdata->capabilities2;
 	mmc->max_segs = 32;
 	mmc->max_blk_size = 512;
 	mmc->max_blk_count = (PAGE_CACHE_SIZE / mmc->max_blk_size) *