From patchwork Wed Dec 15 04:49:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 412441 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 oBF4vXsf009375 for ; Wed, 15 Dec 2010 04:57:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756150Ab0LOE5c (ORCPT ); Tue, 14 Dec 2010 23:57:32 -0500 Received: from mail.lixom.net ([70.86.134.90]:38596 "EHLO mail.lixom.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754954Ab0LOE5b (ORCPT ); Tue, 14 Dec 2010 23:57:31 -0500 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 15 Dec 2010 04:57:34 +0000 (UTC) X-Greylist: delayed 461 seconds by postgrey-1.27 at vger.kernel.org; Tue, 14 Dec 2010 23:57:31 EST Received: by mail.lixom.net (Postfix, from userid 1000) id 7491756611F; Tue, 14 Dec 2010 22:50:04 -0600 (CST) From: Olof Johansson To: Chris Ball Cc: linux-mmc@vger.kernel.org, linux-tegra@vger.kernel.org, Olof Johansson Subject: [PATCH 2/4] sdhci: add quirk for broken sdio irq Date: Tue, 14 Dec 2010 22:49:34 -0600 Message-Id: <1292388576-25600-3-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.7.3.GIT In-Reply-To: <1292388576-25600-1-git-send-email-olof@lixom.net> References: <1292388576-25600-1-git-send-email-olof@lixom.net> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index c0094c1..98f3d3d 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1871,7 +1871,10 @@ int sdhci_add_host(struct sdhci_host *host) mmc->f_min = host->max_clk / SDHCI_MAX_DIV_SPEC_200; mmc->f_max = host->max_clk; - mmc->caps |= MMC_CAP_SDIO_IRQ; + mmc->caps = 0; + + if (!(host->quirks & SDHCI_QUIRK_NO_SDIO_IRQ)) + mmc->caps |= MMC_CAP_SDIO_IRQ; /* * A controller may support 8-bit width, but the board itself diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h index dfb2106..97d547e 100644 --- a/include/linux/mmc/sdhci.h +++ b/include/linux/mmc/sdhci.h @@ -85,6 +85,8 @@ struct sdhci_host { #define SDHCI_QUIRK_NO_HISPD_BIT (1<<29) /* Controller treats ADMA descriptors with length 0000h incorrectly */ #define SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC (1<<30) +/* Controller should not use SDIO IRQ */ +#define SDHCI_QUIRK_NO_SDIO_IRQ (1<<31) int irq; /* Device IRQ */ void __iomem *ioaddr; /* Mapped address */