From patchwork Mon Feb 21 09:54:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 577211 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 p1L9t9C6026746 for ; Mon, 21 Feb 2011 09:55:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751566Ab1BUJzM (ORCPT ); Mon, 21 Feb 2011 04:55:12 -0500 Received: from ch1outboundpool.messaging.microsoft.com ([216.32.181.186]:2828 "EHLO ch1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753186Ab1BUJzL (ORCPT ); Mon, 21 Feb 2011 04:55:11 -0500 Received: from mail207-ch1-R.bigfish.com (216.32.181.174) by CH1EHSOBE009.bigfish.com (10.43.70.59) with Microsoft SMTP Server id 14.1.225.8; Mon, 21 Feb 2011 09:55:09 +0000 Received: from mail207-ch1 (localhost.localdomain [127.0.0.1]) by mail207-ch1-R.bigfish.com (Postfix) with ESMTP id 939FC17902B9 for ; Mon, 21 Feb 2011 09:55:09 +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 mail207-ch1 (localhost.localdomain [127.0.0.1]) by mail207-ch1 (MessageSwitch) id 1298282109420344_6914; Mon, 21 Feb 2011 09:55:09 +0000 (UTC) Received: from CH1EHSMHS008.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.243]) by mail207-ch1.bigfish.com (Postfix) with ESMTP id 64C8AE9804B for ; Mon, 21 Feb 2011 09:55:09 +0000 (UTC) Received: from de01egw01.freescale.net (192.88.165.102) by CH1EHSMHS008.bigfish.com (10.43.70.8) with Microsoft SMTP Server (TLS) id 14.1.225.8; Mon, 21 Feb 2011 09:55:01 +0000 Received: from de01smr02.am.mot.com (de01smr02.freescale.net [10.208.0.151]) by de01egw01.freescale.net (8.14.3/8.14.3) with ESMTP id p1L9t0fK012542 for ; Mon, 21 Feb 2011 02:55:01 -0700 (MST) Received: from b20223-02 (B20223-02.ap.freescale.net [10.192.242.48]) by de01smr02.am.mot.com (8.13.1/8.13.0) with ESMTP id p1L9sx2Y022455 for ; Mon, 21 Feb 2011 03:55:00 -0600 (CST) Received: by b20223-02 (Postfix, from userid 1000) id 6758B321DA7; Mon, 21 Feb 2011 17:54:58 +0800 (CST) From: Richard Zhao To: CC: , , , , , , , , Richard Zhao , Richard Zhu Subject: [PATCH 4/5] mm: sdhci-esdhc: remove SDHCI_QUIRK_NO_CARD_NO_RESET from ESDHC_DEFAULT_QUIRKS Date: Mon, 21 Feb 2011 17:54:54 +0800 Message-ID: <1298282095-2279-4-git-send-email-richard.zhao@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1298282095-2279-1-git-send-email-richard.zhao@freescale.com> References: <1298282095-2279-1-git-send-email-richard.zhao@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.net 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.6 (demeter1.kernel.org [140.211.167.41]); Mon, 21 Feb 2011 09:55:13 +0000 (UTC) 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,