From patchwork Thu Oct 21 21:20:28 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: 272431 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 o9LLKger004012 for ; Thu, 21 Oct 2010 21:20:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754016Ab0JUVUn (ORCPT ); Thu, 21 Oct 2010 17:20:43 -0400 Received: from 63.mail-out.ovh.net ([91.121.185.56]:59195 "HELO 63.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752931Ab0JUVUn (ORCPT ); Thu, 21 Oct 2010 17:20:43 -0400 Received: (qmail 19261 invoked by uid 503); 21 Oct 2010 21:48:42 -0000 Received: from b9.ovh.net (HELO mail239.ha.ovh.net) (213.186.33.59) by 63.mail-out.ovh.net with SMTP; 21 Oct 2010 21:48:42 -0000 Received: from b0.ovh.net (HELO queueout) (213.186.33.50) by b0.ovh.net with SMTP; 21 Oct 2010 23:20:42 +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; 21 Oct 2010 23:20:39 +0200 From: =?UTF-8?q?Eric=20B=C3=A9nard?= To: linux-mmc@vger.kernel.org Cc: 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 2/2] sdhci-esdhc-imx: enable QUIRK_NO_MULTIBLOCK only for i.MX25 and i.MX35 Date: Thu, 21 Oct 2010 23:20:28 +0200 Message-Id: <1287696028-27854-2-git-send-email-eric@eukrea.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <4CC0A281.1010202@eukrea.com> References: <4CC0A281.1010202@eukrea.com> MIME-Version: 1.0 X-Ovh-Tracer-Id: 12585027684759547285 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]); Thu, 21 Oct 2010 21:20:44 +0000 (UTC) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 11e1ae1..4d67f58 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -136,6 +136,12 @@ static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pd host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; } + /* fix errata ENGcm07207 which is present on i.MX25 and i.MX35 */ + if (cpu_is_mx25() || cpu_is_mx35()) { + dev_info(mmc_dev(host->mmc), "using ENGcm07207 workaround\n"); + host->quirks |= SDHCI_QUIRK_NO_MULTIBLOCK; + } + return 0; } @@ -162,10 +168,8 @@ static struct sdhci_ops sdhci_esdhc_ops = { }; struct sdhci_pltfm_data sdhci_esdhc_imx_pdata = { - .quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_NO_MULTIBLOCK - | SDHCI_QUIRK_BROKEN_ADMA, + .quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_BROKEN_ADMA, /* ADMA has issues. Might be fixable */ - /* NO_MULTIBLOCK might be MX35 only (Errata: ENGcm07207) */ .ops = &sdhci_esdhc_ops, .init = esdhc_pltfm_init, .exit = esdhc_pltfm_exit,