[PATCH] mci: core: the sd1.0 card can work in 4 bits mode

[Sascha Hauer]

On Tue, Jul 29, 2014 at 03:59:09PM +0800, Bo Shen wrote:
> The sd 1.0 card can work in 4 bits mode also.
> 
> Signed-off-by: Bo Shen <voice.shen at atmel.com>

Applied, thanks

Sascha

> ---
> 
>  drivers/mci/mci-core.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c
> index ce6e590..8221632 100644
> --- a/drivers/mci/mci-core.c
> +++ b/drivers/mci/mci-core.c
> @@ -616,6 +616,9 @@ retry_scr:
>  		break;
>  	}
>  
> +	if (mci->scr[0] & SD_DATA_4BIT)
> +		mci->card_caps |= MMC_CAP_4_BIT_DATA;
> +
>  	/* Version 1.0 doesn't support switching */
>  	if (mci->version == SD_VERSION_1_0)
>  		return 0;
> @@ -634,9 +637,6 @@ retry_scr:
>  			break;
>  	}
>  
> -	if (mci->scr[0] & SD_DATA_4BIT)
> -		mci->card_caps |= MMC_CAP_4_BIT_DATA;
> -
>  	/* If high-speed isn't supported, we return */
>  	if (!(__be32_to_cpu(switch_status[3]) & SD_HIGHSPEED_SUPPORTED))
>  		return 0;
> -- 
> 1.8.5.2
> 
> 

-- 
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 |