From patchwork Mon Mar 21 03:32:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhu X-Patchwork-Id: 683 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:44:41 -0000 Delivered-To: patches@linaro.org Received: by 10.220.28.198 with SMTP id n6cs112930vcc; Sun, 20 Mar 2011 20:32:58 -0700 (PDT) Received: by 10.42.134.135 with SMTP id l7mr6091093ict.234.1300678376552; Sun, 20 Mar 2011 20:32:56 -0700 (PDT) Received: from TX2EHSOBE001.bigfish.com (mail-tx2.bigfish.com [65.55.88.10]) by mx.google.com with ESMTPS id yc10si7725534icb.35.2011.03.20.20.32.55 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 20 Mar 2011 20:32:56 -0700 (PDT) Received-SPF: neutral (google.com: 65.55.88.10 is neither permitted nor denied by best guess record for domain of R65037@freescale.com) client-ip=65.55.88.10; Authentication-Results: mx.google.com; spf=neutral (google.com: 65.55.88.10 is neither permitted nor denied by best guess record for domain of R65037@freescale.com) smtp.mail=R65037@freescale.com Received: from mail195-tx2-R.bigfish.com (10.9.14.253) by TX2EHSOBE001.bigfish.com (10.9.40.21) with Microsoft SMTP Server id 14.1.225.22; Mon, 21 Mar 2011 03:32:54 +0000 Received: from mail195-tx2 (localhost.localdomain [127.0.0.1]) by mail195-tx2-R.bigfish.com (Postfix) with ESMTP id 55F1111F8148; Mon, 21 Mar 2011 03:32:54 +0000 (UTC) X-SpamScore: -2 X-BigFish: VS-2(zzbb2cKzz1202hzz8275bh1497iz2dh2a8h668h) X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail195-tx2 (localhost.localdomain [127.0.0.1]) by mail195-tx2 (MessageSwitch) id 1300678374228245_17226; Mon, 21 Mar 2011 03:32:54 +0000 (UTC) Received: from TX2EHSMHS032.bigfish.com (unknown [10.9.14.254]) by mail195-tx2.bigfish.com (Postfix) with ESMTP id 322281BC0050; Mon, 21 Mar 2011 03:32:54 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS032.bigfish.com (10.9.99.132) with Microsoft SMTP Server (TLS) id 14.1.225.8; Mon, 21 Mar 2011 03:32:54 +0000 Received: from az33smr02.freescale.net (10.64.34.200) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server id 14.1.270.2; Sun, 20 Mar 2011 22:32:53 -0500 Received: from x-VirtualBox.ap.freescale.net (x-VirtualBox.ap.freescale.net [10.192.242.62]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id p2L3WjN1020528; Sun, 20 Mar 2011 22:32:50 -0500 (CDT) From: Richard Zhu To: CC: , , , , , , , , Richard Zhu Subject: [PATCH V7 1/4] mmc: sdhci-esdhc: remove SDHCI_QUIRK_NO_CARD_NO_RESET from ESDHC_DEFAULT_QUIRKS Date: Mon, 21 Mar 2011 11:32:38 +0800 Message-ID: <1300678361-6259-2-git-send-email-Hong-Xing.Zhu@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1300678361-6259-1-git-send-email-Hong-Xing.Zhu@freescale.com> References: <1300678361-6259-1-git-send-email-Hong-Xing.Zhu@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com sdhci-esdhc-imx does not need SDHCI_QUIRK_NO_CARD_NO_RESET. Make it OF-specific. Signed-off-by: Richard Zhu Tested-by: Wolfram Sang --- drivers/mmc/host/sdhci-esdhc.h | 3 +-- drivers/mmc/host/sdhci-of-esdhc.c | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc.h b/drivers/mmc/host/sdhci-esdhc.h index c55aae8..c3b08f1 100644 --- a/drivers/mmc/host/sdhci-esdhc.h +++ b/drivers/mmc/host/sdhci-esdhc.h @@ -23,8 +23,7 @@ SDHCI_QUIRK_NONSTANDARD_CLOCK | \ SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | \ SDHCI_QUIRK_PIO_NEEDS_DELAY | \ - SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET | \ - SDHCI_QUIRK_NO_CARD_NO_RESET) + SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET) #define ESDHC_SYSTEM_CONTROL 0x2c #define ESDHC_CLOCK_MASK 0x0000fff0 diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index 08161f6..ba40d6d 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -74,7 +74,8 @@ static unsigned int esdhc_of_get_min_clock(struct sdhci_host *host) struct sdhci_of_data sdhci_esdhc = { /* card detection could be handled via GPIO */ - .quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_BROKEN_CARD_DETECTION, + .quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_BROKEN_CARD_DETECTION + | SDHCI_QUIRK_NO_CARD_NO_RESET, .ops = { .read_l = sdhci_be32bs_readl, .read_w = esdhc_readw,