From patchwork Tue Feb 22 10:13:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhu X-Patchwork-Id: 580031 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 p1MALIv0010731 for ; Tue, 22 Feb 2011 10:21:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752095Ab1BVKVR (ORCPT ); Tue, 22 Feb 2011 05:21:17 -0500 Received: from ch1outboundpool.messaging.microsoft.com ([216.32.181.181]:20064 "EHLO ch1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752048Ab1BVKVQ (ORCPT ); Tue, 22 Feb 2011 05:21:16 -0500 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 22 Feb 2011 10:21:18 +0000 (UTC) X-Greylist: delayed 442 seconds by postgrey-1.27 at vger.kernel.org; Tue, 22 Feb 2011 05:21:16 EST Received: from mail111-ch1-R.bigfish.com (216.32.181.171) by CH1EHSOBE014.bigfish.com (10.43.70.64) with Microsoft SMTP Server id 14.1.225.8; Tue, 22 Feb 2011 10:21:15 +0000 Received: from mail111-ch1 (localhost.localdomain [127.0.0.1]) by mail111-ch1-R.bigfish.com (Postfix) with ESMTP id E0ED01458216; Tue, 22 Feb 2011 10:21:15 +0000 (UTC) X-SpamScore: -2 X-BigFish: VS-2(zzbb2cKzz1202hzz8275bh1497iz2dh2a8h668h61h) X-Spam-TCS-SCL: 0:0 X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:de01egw01.freescale.net; RD:de01egw01.freescale.net; EFVD:NLI Received: from mail111-ch1 (localhost.localdomain [127.0.0.1]) by mail111-ch1 (MessageSwitch) id 1298370075776614_13809; Tue, 22 Feb 2011 10:21:15 +0000 (UTC) Received: from CH1EHSMHS028.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.245]) by mail111-ch1.bigfish.com (Postfix) with ESMTP id BAA8DF68050; Tue, 22 Feb 2011 10:21:15 +0000 (UTC) Received: from de01egw01.freescale.net (192.88.165.102) by CH1EHSMHS028.bigfish.com (10.43.70.28) with Microsoft SMTP Server (TLS) id 14.1.225.8; Tue, 22 Feb 2011 10:21:15 +0000 Received: from az33smr02.freescale.net (az33smr02.freescale.net [10.64.34.200]) by de01egw01.freescale.net (8.14.3/8.14.3) with ESMTP id p1MADiWq025488; Tue, 22 Feb 2011 03:13:44 -0700 (MST) Received: from x-VirtualBox.ap.freescale.net ([10.192.242.62]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id p1MADR7i029788; Tue, 22 Feb 2011 04:13:40 -0600 (CST) From: Richard Zhu To: CC: , , , , , , , , Richard Zhu Subject: [PATCH v2 4/5] mmc: sdhci-esdhc: remove SDHCI_QUIRK_NO_CARD_NO_RESET from ESDHC_DEFAULT_QUIRKS Date: Tue, 22 Feb 2011 18:13:25 +0800 Message-ID: <1298369606-29972-4-git-send-email-Hong-Xing.Zhu@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1298369606-29972-1-git-send-email-Hong-Xing.Zhu@freescale.com> References: <1298369606-29972-1-git-send-email-Hong-Xing.Zhu@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com 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-esdhc.h b/drivers/mmc/host/sdhci-esdhc.h index afaf1bc..303cde0 100644 --- a/drivers/mmc/host/sdhci-esdhc.h +++ b/drivers/mmc/host/sdhci-esdhc.h @@ -24,8 +24,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 fcd0e1f..6337607 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -73,7 +73,7 @@ static unsigned int esdhc_of_get_min_clock(struct sdhci_host *host) } struct sdhci_of_data sdhci_esdhc = { - .quirks = ESDHC_DEFAULT_QUIRKS, + .quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_NO_CARD_NO_RESET, .ops = { .read_l = sdhci_be32bs_readl, .read_w = esdhc_readw,