[PATCH] mmc: unbreak sdhci-esdhc-imx on i.MX25

[PATCH] mmc: unbreak sdhci-esdhc-imx on i.MX25

[Eric Bénard]

this was broken by me in 37865fe91582582a6f6c00652f6a2b1ff71f8a78
"mmc: sdhci-esdhc-imx: fix timeout on i.MX's sdhc" where more
extensive tests would have shown that read or write of data
to the card were failing (even if the partition table was
correctly read).

Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
---
 drivers/mmc/host/sdhci-esdhc-imx.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 6193a0d..8abdaf6 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -467,8 +467,7 @@ static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev)
 	clk_prepare_enable(clk);
 	pltfm_host->clk = clk;
 
-	if (!is_imx25_esdhc(imx_data))
-		host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
+	host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
 
 	if (is_imx25_esdhc(imx_data) || is_imx35_esdhc(imx_data))
 		/* Fix errata ENGcm07207 present on i.MX25 and i.MX35 */
-- 
1.7.7.6

Re: [PATCH] mmc: unbreak sdhci-esdhc-imx on i.MX25

[Chris Ball]

Hi,

On Tue, Apr 17 2012, Eric Bénard wrote:
> this was broken by me in 37865fe91582582a6f6c00652f6a2b1ff71f8a78
> "mmc: sdhci-esdhc-imx: fix timeout on i.MX's sdhc" where more
> extensive tests would have shown that read or write of data
> to the card were failing (even if the partition table was
> correctly read).
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> Acked-by: Wolfram Sang <w.sang@pengutronix.de>
> ---
>  drivers/mmc/host/sdhci-esdhc-imx.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
> index 6193a0d..8abdaf6 100644
> --- a/drivers/mmc/host/sdhci-esdhc-imx.c
> +++ b/drivers/mmc/host/sdhci-esdhc-imx.c
> @@ -467,8 +467,7 @@ static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev)
>  	clk_prepare_enable(clk);
>  	pltfm_host->clk = clk;
>  
> -	if (!is_imx25_esdhc(imx_data))
> -		host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
> +	host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
>  
>  	if (is_imx25_esdhc(imx_data) || is_imx35_esdhc(imx_data))
>  		/* Fix errata ENGcm07207 present on i.MX25 and i.MX35 */

Thanks, pushed to mmc-next for 3.4.

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

Re: [PATCH] mmc: unbreak sdhci-esdhc-imx on i.MX25

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

On Wed, Apr 18, 2012 at 08:00:42PM -0400, Chris Ball wrote:

> Thanks, pushed to mmc-next for 3.4.

If not done already, I think a stable-tag would make sense.

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] mmc: unbreak sdhci-esdhc-imx on i.MX25

[Chris Ball]

Hi,

On Wed, Apr 18 2012, Wolfram Sang wrote:
> On Wed, Apr 18, 2012 at 08:00:42PM -0400, Chris Ball wrote:
>
>> Thanks, pushed to mmc-next for 3.4.
>
> If not done already, I think a stable-tag would make sense.

Thanks for noticing -- agreed and added.

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