diff mbox

[v2,05/11] mmc: sh-mmcif: use mmc_of_parse() to parse standard MMC DT bindings

Message ID 1358955158-1510-6-git-send-email-g.liakhovetski@gmx.de (mailing list archive)
State New, archived
Headers show

Commit Message

Guennadi Liakhovetski Jan. 23, 2013, 3:32 p.m. UTC
Use mmc_of_parse() to get interface capability flags and used GPIOs from
device-tree bindings.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
 drivers/mmc/host/sh_mmcif.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Comments

Chris Ball Jan. 28, 2013, 10:25 p.m. UTC | #1
Hi Guennadi,

On Wed, Jan 23 2013, Guennadi Liakhovetski wrote:
> Use mmc_of_parse() to get interface capability flags and used GPIOs from
> device-tree bindings.
>
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> ---
>  drivers/mmc/host/sh_mmcif.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
> index 741aeb9..4de94a1 100644
> --- a/drivers/mmc/host/sh_mmcif.c
> +++ b/drivers/mmc/host/sh_mmcif.c
> @@ -1329,6 +1329,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
>  		ret = -ENOMEM;
>  		goto ealloch;
>  	}
> +	mmc_of_parse(mmc);
>  	host		= mmc_priv(mmc);
>  	host->mmc	= mmc;
>  	host->addr	= reg;
> @@ -1341,7 +1342,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
>  	mmc->ops = &sh_mmcif_ops;
>  	sh_mmcif_init_ocr(host);
>  
> -	mmc->caps = MMC_CAP_MMC_HIGHSPEED;
> +	mmc->caps |= MMC_CAP_MMC_HIGHSPEED;
>  	if (pd && pd->caps)
>  		mmc->caps |= pd->caps;
>  	mmc->max_segs = 32;

This patch doesn't apply because you don't seem to have this patch:

Author: Teppei Kamijou <teppei.kamijou.yb@renesas.com>
Date:   Wed Dec 12 15:38:10 2012 +0100
Subject: mmc: sh_mmcif: Avoid unnecessary mmc_delay() at mmc_card_sleepawake()

- Chris.
diff mbox

Patch

diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 741aeb9..4de94a1 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -1329,6 +1329,7 @@  static int sh_mmcif_probe(struct platform_device *pdev)
 		ret = -ENOMEM;
 		goto ealloch;
 	}
+	mmc_of_parse(mmc);
 	host		= mmc_priv(mmc);
 	host->mmc	= mmc;
 	host->addr	= reg;
@@ -1341,7 +1342,7 @@  static int sh_mmcif_probe(struct platform_device *pdev)
 	mmc->ops = &sh_mmcif_ops;
 	sh_mmcif_init_ocr(host);
 
-	mmc->caps = MMC_CAP_MMC_HIGHSPEED;
+	mmc->caps |= MMC_CAP_MMC_HIGHSPEED;
 	if (pd && pd->caps)
 		mmc->caps |= pd->caps;
 	mmc->max_segs = 32;