From patchwork Wed Jun 15 11:15:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 1918 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9464524B31 for ; Wed, 15 Jun 2011 11:10:09 +0000 (UTC) Received: from mail-vx0-f180.google.com (mail-vx0-f180.google.com [209.85.220.180]) by fiordland.canonical.com (Postfix) with ESMTP id 63ABCA1892A for ; Wed, 15 Jun 2011 11:10:09 +0000 (UTC) Received: by mail-vx0-f180.google.com with SMTP id 12so251839vxk.11 for ; Wed, 15 Jun 2011 04:10:09 -0700 (PDT) Received: by 10.52.112.106 with SMTP id ip10mr548579vdb.127.1308136209198; Wed, 15 Jun 2011 04:10:09 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.52.183.130 with SMTP id em2cs118257vdc; Wed, 15 Jun 2011 04:10:09 -0700 (PDT) Received: by 10.14.10.18 with SMTP id 18mr181405eeu.172.1308136207979; Wed, 15 Jun 2011 04:10:07 -0700 (PDT) Received: from AM1EHSOBE006.bigfish.com (am1ehsobe006.messaging.microsoft.com [213.199.154.209]) by mx.google.com with ESMTPS id z1si1013200eem.67.2011.06.15.04.10.06 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Jun 2011 04:10:06 -0700 (PDT) Received-SPF: neutral (google.com: 213.199.154.209 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=213.199.154.209; Authentication-Results: mx.google.com; spf=neutral (google.com: 213.199.154.209 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: from mail41-am1-R.bigfish.com (10.3.201.252) by AM1EHSOBE006.bigfish.com (10.3.204.26) with Microsoft SMTP Server id 14.1.225.22; Wed, 15 Jun 2011 11:10:06 +0000 Received: from mail41-am1 (localhost.localdomain [127.0.0.1]) by mail41-am1-R.bigfish.com (Postfix) with ESMTP id 13F3B40223; Wed, 15 Jun 2011 11:10:06 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dh87h2a8h668h839h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-DOMAIN-IP-MATCH: fail Received: from mail41-am1 (localhost.localdomain [127.0.0.1]) by mail41-am1 (MessageSwitch) id 1308136205818748_16196; Wed, 15 Jun 2011 11:10:05 +0000 (UTC) Received: from AM1EHSMHS009.bigfish.com (unknown [10.3.201.252]) by mail41-am1.bigfish.com (Postfix) with ESMTP id C33A8380002; Wed, 15 Jun 2011 11:10:05 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by AM1EHSMHS009.bigfish.com (10.3.207.109) with Microsoft SMTP Server (TLS) id 14.1.225.22; Wed, 15 Jun 2011 11:10:02 +0000 Received: from az33smr02.freescale.net (10.64.34.200) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.289.8; Wed, 15 Jun 2011 06:10:00 -0500 Received: from S2100-06.ap.freescale.net (S2100-06.ap.freescale.net [10.192.242.125]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id p5FB9l3H013936; Wed, 15 Jun 2011 06:09:57 -0500 (CDT) From: Shawn Guo To: CC: Chris Ball , Wolfram Sang , Arnaud Patard , Eric Benard , Pavel Machek , , , , Shawn Guo Subject: [PATCH v2 3/4] mmc: sdhci-esdhc-imx: remove "WP" from flag ESDHC_FLAG_GPIO_FOR_CD_WP Date: Wed, 15 Jun 2011 19:15:21 +0800 Message-ID: <1308136522-3403-4-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1308136522-3403-1-git-send-email-shawn.guo@linaro.org> References: <1308136522-3403-1-git-send-email-shawn.guo@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com The use of flag ESDHC_FLAG_GPIO_FOR_CD_WP is all CD related. It does not necessarily need to bother WP in the flag name. Signed-off-by: Shawn Guo --- drivers/mmc/host/sdhci-esdhc-imx.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 94097c0..79b7a9a 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -29,7 +29,7 @@ #define SDHCI_VENDOR_SPEC 0xC0 #define SDHCI_VENDOR_SPEC_SDIO_QUIRK 0x00000002 -#define ESDHC_FLAG_GPIO_FOR_CD_WP (1 << 0) +#define ESDHC_FLAG_GPIO_FOR_CD (1 << 0) /* * The CMDTYPE of the CMD register (offset 0xE) should be set to * "11" when the STOP CMD12 is issued on imx53 to abort one @@ -77,7 +77,7 @@ static u32 esdhc_readl_le(struct sdhci_host *host, int reg) u32 val = readl(host->ioaddr + reg); if (unlikely((reg == SDHCI_PRESENT_STATE) - && (imx_data->flags & ESDHC_FLAG_GPIO_FOR_CD_WP))) { + && (imx_data->flags & ESDHC_FLAG_GPIO_FOR_CD))) { struct esdhc_platform_data *boarddata = host->mmc->parent->platform_data; @@ -99,7 +99,7 @@ static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg) struct pltfm_imx_data *imx_data = pltfm_host->priv; if (unlikely((reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE) - && (imx_data->flags & ESDHC_FLAG_GPIO_FOR_CD_WP))) + && (imx_data->flags & ESDHC_FLAG_GPIO_FOR_CD))) /* * these interrupts won't work with a custom card_detect gpio * (only applied to mx25/35) @@ -308,7 +308,7 @@ static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev) goto no_card_detect_irq; } - imx_data->flags |= ESDHC_FLAG_GPIO_FOR_CD_WP; + imx_data->flags |= ESDHC_FLAG_GPIO_FOR_CD; /* Now we have a working card_detect again */ host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION; }