From patchwork Tue Aug 10 09:47:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zang Roy-R61911 X-Patchwork-Id: 176442 Return-path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on void.printf.net X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.9 tests=RCVD_IN_DNSWL_LOW autolearn=disabled version=3.2.5 Envelope-to: chris@printf.net Delivery-date: Tue, 10 Aug 2010 11:03:53 +0100 Received: from lists.laptop.org ([18.85.2.145] helo=mail.laptop.org) by void.printf.net with esmtp (Exim 4.69) (envelope-from ) id 1OilgX-0001sJ-Dd for chris@printf.net; Tue, 10 Aug 2010 11:03:53 +0100 Received: by mail.laptop.org (Postfix) id C0474245C1; Tue, 10 Aug 2010 06:03:34 -0400 (EDT) Delivered-To: cjb@laptop.org Received: from spam.laptop.org (spam.laptop.org [18.85.46.23]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.laptop.org (Postfix) with ESMTPS id 73186245C0 for ; Tue, 10 Aug 2010 06:03:34 -0400 (EDT) X-ASG-Debug-ID: 1281434627-0b7471530002-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id g2wA6dN4r9KPoAWx for ; Tue, 10 Aug 2010 06:03:48 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751686Ab0HJKDo (ORCPT ); Tue, 10 Aug 2010 06:03:44 -0400 Received: from va3ehsobe006.messaging.microsoft.com ([216.32.180.16]:8208 "EHLO VA3EHSOBE008.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751633Ab0HJKDn (ORCPT ); Tue, 10 Aug 2010 06:03:43 -0400 Received: from mail185-va3-R.bigfish.com (10.7.14.246) by VA3EHSOBE008.bigfish.com (10.7.40.28) with Microsoft SMTP Server id 8.1.340.0; Tue, 10 Aug 2010 10:03:42 +0000 Received: from mail185-va3 (localhost.localdomain [127.0.0.1]) by mail185-va3-R.bigfish.com (Postfix) with ESMTP id 65765470246; Tue, 10 Aug 2010 10:03:42 +0000 (UTC) X-SpamScore: 1 X-BigFish: VS1(zzzz1202hzz1497iz2dh2a8h62h) Received: from mail185-va3 (localhost.localdomain [127.0.0.1]) by mail185-va3 (MessageSwitch) id 1281434621608779_2530; Tue, 10 Aug 2010 10:03:41 +0000 (UTC) Received: from VA3EHSMHS031.bigfish.com (unknown [10.7.14.252]) by mail185-va3.bigfish.com (Postfix) with ESMTP id 63EE51260051; Tue, 10 Aug 2010 10:03:41 +0000 (UTC) Received: from az33egw02.freescale.net (192.88.158.103) by VA3EHSMHS031.bigfish.com (10.7.99.41) with Microsoft SMTP Server (TLS) id 14.0.482.44; Tue, 10 Aug 2010 10:03:40 +0000 Received: from az33smr01.freescale.net (az33smr01.freescale.net [10.64.34.199]) by az33egw02.freescale.net (8.14.3/8.14.3) with ESMTP id o7AA3bbM009649; Tue, 10 Aug 2010 03:03:37 -0700 (MST) Received: from localhost.localdomain (rock.ap.freescale.net [10.193.20.106]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id o7AAF3v8007904; Tue, 10 Aug 2010 05:15:04 -0500 (CDT) From: Roy Zang To: akpm@linux-foundation.org, linux-mmc@vger.kernel.org CC: linuxppc-dev@ozlabs.org, mirqus@gmail.com, cbouatmailru@gmail.com, grant.likely@secretlab.ca X-ASG-Orig-Subj: [PATCH 1/2] mmc: change ACMD12 to AUTO_CMD12 for more clear Subject: [PATCH 1/2] mmc: change ACMD12 to AUTO_CMD12 for more clear Date: Tue, 10 Aug 2010 17:47:11 +0800 Message-ID: <1281433632-18758-1-git-send-email-tie-fei.zang@freescale.com> X-Mailer: git-send-email 1.5.6.5 MIME-Version: 1.0 X-Reverse-DNS: az33egw02.freescale.net Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Barracuda-Connect: vger.kernel.org[209.132.180.67] X-Barracuda-Start-Time: 1281434628 X-Barracuda-URL: http://18.85.46.23:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at laptop.org X-Barracuda-Spam-Score: 0.50 X-Barracuda-Spam-Status: No, SCORE=0.50 using global scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=5.5 tests=BSF_RULE7568M X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.37573 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.50 BSF_RULE7568M Custom Rule 7568M diff --git a/drivers/mmc/host/sdhci-of-core.c b/drivers/mmc/host/sdhci-of-core.c index dd1bdd1..d059805 100644 --- a/drivers/mmc/host/sdhci-of-core.c +++ b/drivers/mmc/host/sdhci-of-core.c @@ -155,7 +155,7 @@ static int __devinit sdhci_of_probe(struct of_device *ofdev, } if (of_get_property(np, "sdhci,auto-cmd12", NULL)) - host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12; + host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_AUTO_CMD12; if (of_get_property(np, "sdhci,1-bit-only", NULL)) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index a92566e..4b7b2d5 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -73,7 +73,7 @@ static void sdhci_dumpregs(struct sdhci_host *host) sdhci_readl(host, SDHCI_INT_ENABLE), sdhci_readl(host, SDHCI_SIGNAL_ENABLE)); printk(KERN_DEBUG DRIVER_NAME ": AC12 err: 0x%08x | Slot int: 0x%08x\n", - sdhci_readw(host, SDHCI_ACMD12_ERR), + sdhci_readw(host, SDHCI_AUTO_CMD12_ERR), sdhci_readw(host, SDHCI_SLOT_INT_STATUS)); printk(KERN_DEBUG DRIVER_NAME ": Caps: 0x%08x | Max curr: 0x%08x\n", sdhci_readl(host, SDHCI_CAPABILITIES), @@ -818,8 +818,8 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host, mode = SDHCI_TRNS_BLK_CNT_EN; if (data->blocks > 1) { - if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12) - mode |= SDHCI_TRNS_MULTI | SDHCI_TRNS_ACMD12; + if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_AUTO_CMD12) + mode |= SDHCI_TRNS_MULTI | SDHCI_TRNS_AUTO_CMD12; else mode |= SDHCI_TRNS_MULTI; } @@ -1112,7 +1112,7 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) #ifndef SDHCI_USE_LEDS_CLASS sdhci_activate_led(host); #endif - if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12) { + if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_AUTO_CMD12) { if (mrq->stop) { mrq->data->stop = NULL; mrq->stop = NULL; diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 8fb088c..dfe1c4a 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -32,7 +32,7 @@ #define SDHCI_TRANSFER_MODE 0x0C #define SDHCI_TRNS_DMA 0x01 #define SDHCI_TRNS_BLK_CNT_EN 0x02 -#define SDHCI_TRNS_ACMD12 0x04 +#define SDHCI_TRNS_AUTO_CMD12 0x04 #define SDHCI_TRNS_READ 0x10 #define SDHCI_TRNS_MULTI 0x20 @@ -116,7 +116,7 @@ #define SDHCI_INT_DATA_CRC 0x00200000 #define SDHCI_INT_DATA_END_BIT 0x00400000 #define SDHCI_INT_BUS_POWER 0x00800000 -#define SDHCI_INT_ACMD12ERR 0x01000000 +#define SDHCI_INT_AUTO_CMD12_ERR 0x01000000 #define SDHCI_INT_ADMA_ERROR 0x02000000 #define SDHCI_INT_NORMAL_MASK 0x00007FFF @@ -130,7 +130,7 @@ SDHCI_INT_DATA_END_BIT | SDHCI_INT_ADMA_ERROR) #define SDHCI_INT_ALL_MASK ((unsigned int)-1) -#define SDHCI_ACMD12_ERR 0x3C +#define SDHCI_AUTO_CMD12_ERR 0x3C /* 3E-3F reserved */ @@ -157,7 +157,7 @@ /* 4C-4F reserved for more max current */ -#define SDHCI_SET_ACMD12_ERROR 0x50 +#define SDHCI_SET_AUTO_CMD12_ERROR 0x50 #define SDHCI_SET_INT_ERROR 0x52 #define SDHCI_ADMA_ERROR 0x54 @@ -241,7 +241,7 @@ struct sdhci_host { /* Controller cannot support End Attribute in NOP ADMA descriptor */ #define SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC (1<<26) /* Controller uses Auto CMD12 command to stop the transfer */ -#define SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 (1<<27) +#define SDHCI_QUIRK_MULTIBLOCK_READ_AUTO_CMD12 (1<<27) int irq; /* Device IRQ */ void __iomem * ioaddr; /* Mapped address */