[PATCH] mmc: sdhci: fix ctrl_2 on super-speed selection

[PATCH] mmc: sdhci: fix ctrl_2 on super-speed selection

[Giuseppe CAVALLARO]

This patch fixes the HC ctrl_2 programming where, in case of
SDR104 and HS200, we have to write 100b in the the UHS Mode
bits. We wrote 101b that is reserved from Arasan Specs.

Reported-by: Youssef Triki <youssef.triki@st.com>
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
---
 drivers/mmc/host/sdhci.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index b8bb3b3..ae745ab 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1526,16 +1526,15 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)
 			ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);
 			/* Select Bus Speed Mode for host */
 			ctrl_2 &= ~SDHCI_CTRL_UHS_MASK;
-			if (ios->timing == MMC_TIMING_MMC_HS200)
-				ctrl_2 |= SDHCI_CTRL_HS_SDR200;
+			if ((ios->timing == MMC_TIMING_MMC_HS200) ||
+			    (ios->timing == MMC_TIMING_UHS_SDR104))
+				ctrl_2 |= SDHCI_CTRL_UHS_SDR104;
 			else if (ios->timing == MMC_TIMING_UHS_SDR12)
 				ctrl_2 |= SDHCI_CTRL_UHS_SDR12;
 			else if (ios->timing == MMC_TIMING_UHS_SDR25)
 				ctrl_2 |= SDHCI_CTRL_UHS_SDR25;
 			else if (ios->timing == MMC_TIMING_UHS_SDR50)
 				ctrl_2 |= SDHCI_CTRL_UHS_SDR50;
-			else if (ios->timing == MMC_TIMING_UHS_SDR104)
-				ctrl_2 |= SDHCI_CTRL_UHS_SDR104;
 			else if (ios->timing == MMC_TIMING_UHS_DDR50)
 				ctrl_2 |= SDHCI_CTRL_UHS_DDR50;
 			sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2);
-- 
1.7.4.4

Re: [PATCH] mmc: sdhci: fix ctrl_2 on super-speed selection

[Chris Ball]

Hi Giuseppe,

On Thu, Jun 13 2013, Giuseppe CAVALLARO wrote:
> This patch fixes the HC ctrl_2 programming where, in case of
> SDR104 and HS200, we have to write 100b in the the UHS Mode
> bits. We wrote 101b that is reserved from Arasan Specs.
>
> Reported-by: Youssef Triki <youssef.triki@st.com>
> Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
> ---
>  drivers/mmc/host/sdhci.c |    7 +++----
>  1 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index b8bb3b3..ae745ab 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -1526,16 +1526,15 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)
>  			ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);
>  			/* Select Bus Speed Mode for host */
>  			ctrl_2 &= ~SDHCI_CTRL_UHS_MASK;
> -			if (ios->timing == MMC_TIMING_MMC_HS200)
> -				ctrl_2 |= SDHCI_CTRL_HS_SDR200;
> +			if ((ios->timing == MMC_TIMING_MMC_HS200) ||
> +			    (ios->timing == MMC_TIMING_UHS_SDR104))
> +				ctrl_2 |= SDHCI_CTRL_UHS_SDR104;
>  			else if (ios->timing == MMC_TIMING_UHS_SDR12)
>  				ctrl_2 |= SDHCI_CTRL_UHS_SDR12;
>  			else if (ios->timing == MMC_TIMING_UHS_SDR25)
>  				ctrl_2 |= SDHCI_CTRL_UHS_SDR25;
>  			else if (ios->timing == MMC_TIMING_UHS_SDR50)
>  				ctrl_2 |= SDHCI_CTRL_UHS_SDR50;
> -			else if (ios->timing == MMC_TIMING_UHS_SDR104)
> -				ctrl_2 |= SDHCI_CTRL_UHS_SDR104;
>  			else if (ios->timing == MMC_TIMING_UHS_DDR50)
>  				ctrl_2 |= SDHCI_CTRL_UHS_DDR50;
>  			sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2);

Thanks, pushed to mmc-next for 3.11.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child