[PATCHv2] mci: omap: Fix default value of mci.f_max

[PATCHv2] mci: omap: Fix default value of mci.f_max

[Teresa Gámez]

With commit c2ef47887 mci.f_max default value is
only set when pdata is available.

Fix this with always setting the mci.f_max default
value and overrite it when pdata available.

Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
---
changes in v2:
- set default value always and overwrite it when pdata available 
- updated commit message

 drivers/mci/omap_hsmmc.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/mci/omap_hsmmc.c b/drivers/mci/omap_hsmmc.c
index a2cd3fe..19db461 100644
--- a/drivers/mci/omap_hsmmc.c
+++ b/drivers/mci/omap_hsmmc.c
@@ -609,19 +609,17 @@ static int omap_mmc_probe(struct device_d *dev)
 	hsmmc->mci.voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
 
 	hsmmc->mci.f_min = 400000;
+	hsmmc->mci.f_max = 52000000;
 
 	pdata = (struct omap_hsmmc_platform_data *)dev->platform_data;
 	if (pdata) {
 		if (pdata->f_max)
 			hsmmc->mci.f_max = pdata->f_max;
-		else
-			hsmmc->mci.f_max = 52000000;
 
 		if (pdata->devname)
 			hsmmc->mci.devname = pdata->devname;
 	}
 
-
 	dev->priv = hsmmc;
 	dev->detect = omap_mmc_detect,
 
-- 
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCHv2] mci: omap: Fix default value of mci.f_max

[Sascha Hauer]

On Wed, Oct 02, 2013 at 08:22:30AM +0200, Teresa Gámez wrote:
> With commit c2ef47887 mci.f_max default value is
> only set when pdata is available.
> 
> Fix this with always setting the mci.f_max default
> value and overrite it when pdata available.
> 
> Signed-off-by: Teresa Gámez <t.gamez@phytec.de>

Applied, thanks

Sascha

> ---
> changes in v2:
> - set default value always and overwrite it when pdata available 
> - updated commit message
> 
>  drivers/mci/omap_hsmmc.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mci/omap_hsmmc.c b/drivers/mci/omap_hsmmc.c
> index a2cd3fe..19db461 100644
> --- a/drivers/mci/omap_hsmmc.c
> +++ b/drivers/mci/omap_hsmmc.c
> @@ -609,19 +609,17 @@ static int omap_mmc_probe(struct device_d *dev)
>  	hsmmc->mci.voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
>  
>  	hsmmc->mci.f_min = 400000;
> +	hsmmc->mci.f_max = 52000000;
>  
>  	pdata = (struct omap_hsmmc_platform_data *)dev->platform_data;
>  	if (pdata) {
>  		if (pdata->f_max)
>  			hsmmc->mci.f_max = pdata->f_max;
> -		else
> -			hsmmc->mci.f_max = 52000000;
>  
>  		if (pdata->devname)
>  			hsmmc->mci.devname = pdata->devname;
>  	}
>  
> -
>  	dev->priv = hsmmc;
>  	dev->detect = omap_mmc_detect,
>  
> -- 
> 1.7.0.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox