From patchwork Fri Oct 22 23:57:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Eric_B=C3=A9nard?= X-Patchwork-Id: 278541 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9MNvudA025995 for ; Fri, 22 Oct 2010 23:57:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756682Ab0JVX53 (ORCPT ); Fri, 22 Oct 2010 19:57:29 -0400 Received: from 63.mail-out.ovh.net ([91.121.185.56]:41529 "HELO 63.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755537Ab0JVX51 (ORCPT ); Fri, 22 Oct 2010 19:57:27 -0400 Received: (qmail 18514 invoked by uid 503); 23 Oct 2010 00:25:33 -0000 Received: from b9.ovh.net (HELO mail239.ha.ovh.net) (213.186.33.59) by 63.mail-out.ovh.net with SMTP; 23 Oct 2010 00:25:33 -0000 Received: from b0.ovh.net (HELO queueout) (213.186.33.50) by b0.ovh.net with SMTP; 23 Oct 2010 01:57:25 +0200 Received: from tal33-3-82-233-81-124.fbx.proxad.net (HELO localhost.localdomain) (ebenard%eukrea.com@82.233.81.124) by ns0.ovh.net with SMTP; 23 Oct 2010 01:57:24 +0200 From: =?UTF-8?q?Eric=20B=C3=A9nard?= To: cjb@laptop.org Cc: linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, shawn.gsc@gmail.com, w.sang@pengutronix.de, nicolas.pitre@linaro.org, r65037@freescale.com, amit.kucheria@linaro.org, =?UTF-8?q?Eric=20B=C3=A9nard?= Subject: [PATCH 1/2] sdhci-esdhc-imx: fix timeout on i.MX's sdhci Date: Sat, 23 Oct 2010 01:57:21 +0200 Message-Id: <1287791842-706-1-git-send-email-eric@eukrea.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <20101022231203.GA6502@void.printf.net> References: <20101022231203.GA6502@void.printf.net> MIME-Version: 1.0 X-Ovh-Tracer-Id: 2658249681906019638 X-Ovh-Remote: 82.233.81.124 (tal33-3-82-233-81-124.fbx.proxad.net) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-Spam-Check: DONE|U 0.5/N Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 22 Oct 2010 23:57:57 +0000 (UTC) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 2e9cca1..28e63ef 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "sdhci.h" #include "sdhci-pltfm.h" #include "sdhci-esdhc.h" @@ -112,6 +113,9 @@ static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pd clk_enable(clk); pltfm_host->clk = clk; + if (cpu_is_mx35() || cpu_is_mx51()) + host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; + return 0; }