From patchwork Fri Apr 15 17:29:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 8854411 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1D161BF29F for ; Fri, 15 Apr 2016 17:53:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 39A6A20218 for ; Fri, 15 Apr 2016 17:53:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1BA852021A for ; Fri, 15 Apr 2016 17:53:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750783AbcDORxm (ORCPT ); Fri, 15 Apr 2016 13:53:42 -0400 Received: from mail-bn1on0060.outbound.protection.outlook.com ([157.56.110.60]:23552 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750776AbcDORxl (ORCPT ); Fri, 15 Apr 2016 13:53:41 -0400 Received: from BN3PR0301CA0021.namprd03.prod.outlook.com (10.160.180.159) by BY2PR0301MB0710.namprd03.prod.outlook.com (10.160.63.152) with Microsoft SMTP Server (TLS) id 15.1.453.26; Fri, 15 Apr 2016 17:37:31 +0000 Received: from BN1BFFO11FD053.protection.gbl (2a01:111:f400:7c10::1:108) by BN3PR0301CA0021.outlook.office365.com (2a01:111:e400:4000::31) with Microsoft SMTP Server (TLS) id 15.1.466.19 via Frontend Transport; Fri, 15 Apr 2016 17:37:30 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; gmail.com; dkim=none (message not signed) header.d=none; gmail.com; dmarc=none action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD053.mail.protection.outlook.com (10.58.145.8) with Microsoft SMTP Server (TLS) id 15.1.453.6 via Frontend Transport; Fri, 15 Apr 2016 17:37:30 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u3FHb2HJ019919; Fri, 15 Apr 2016 10:37:27 -0700 From: Dong Aisheng To: CC: , , , , , , , Subject: [PATCH 08/23] mmc: sdhci: rename quirk SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 Date: Sat, 16 Apr 2016 01:29:32 +0800 Message-ID: <1460741387-23815-9-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1460741387-23815-1-git-send-email-aisheng.dong@nxp.com> References: <1460741387-23815-1-git-send-email-aisheng.dong@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131052154509663908; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(77096005)(110136002)(50226001)(1096002)(1220700001)(5003940100001)(11100500001)(50466002)(86362001)(92566002)(2906002)(104016004)(6806005)(5008740100001)(2351001)(189998001)(4326007)(586003)(36756003)(85426001)(87936001)(50986999)(105606002)(106466001)(2950100001)(76176999)(19580405001)(47776003)(48376002)(229853001)(33646002)(19580395003)(81166005)(15760500001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0710; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD053; 1:bT6eI670znkmIw3QCm2c1062XB5MO4oOYI9hWrSISkJoxrNXX3dmZkemVnfJmDf4rB1hP3TrekUCRA3yj/LQQVG1jos2osRzDh7kwENsENmxsbqqaE0ywMaeAUJUghGy8DPTbFmXW7dL4anbIaTplMq4HlXdHKy8Onc+5XBrmNvq70zlg7TPi9sWMW0amRAGyqqRAt3tvrfIHmp8B0RzqiuUnRT9XJBdeCKkH3SFaXl0S17n7HjHEKepebi9qmnhZcJ2h5QuCNZllHY/WyxwKUpsnt7uBeNngZLIZm8I08uYHyMjIB+ZUXprKNv9MnupEuuhpMBLnoqicNXcFxs1Yg20huFyTCbniimxFoJ0gRiWxKS6ntCiq6gUOl82nGKLdj41WXtWffY9S5TLcg9zNLd/lQZSNT0laa0ifegqZeAqse9AkILPsmfdp5+lxhMZc7phadCtVsEjmBWmbrAYVShXIdMVdDPPA+/NvVhasF7NZJ9V8p6obzwJcYEZJrmZDa+u0Ydg2i7053yoISwH/5O1JbV6as70/NRgacZgGhdBaZFvhl4mo0KFas+YVZ060f3JRdrHheR8jujeV3P4ETKKJRj4A5Cbenb4lmV28OlWiwzt/E76/iAh0BUMRn1s MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: b2d75fce-da8c-421f-bd47-08d365549f0d X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0710; 2:3CQsirAKg8Lactzv0FRsMRqs5HNMj/TZK4ThS6wcFJOj/DbhxhWoY2RiJTzsW2Dv3sr6iv+7bu7YuHtaqq8mK67nz9xt23FcAfceAP0Dc9Ds63Rj/CCWxWBcz1F8oTAzgkIHuXa75bZelyi3IjMXNQ21ZdtmCnG66fakkTZUb9fkuvmbPYvfW8mZvxRZINni; 3:61/uTxTEu7EBJvXyUY4H8X4FHhLLSsgd7hH+m+/Rak+gnsA84l5tX6Yz3xddi1IXYXNOhzB6s1wB/nocd8Pxvfl6AEWnD3NazF3urM+B6ziUMUSQxs7PrdmHwucKRDnKezuC3xQzwOlmWMweUukgl2lXvw9uaspm1Zvdxnn51+ObqDcNyNq/v8Dmt8EUBi686rjaR9wY0/e2GnN5heQEkHkV+bDXUCv0OB8Ri/R8gug=; 25:IRU6+oAMPFKkgEApzJiFFeYJ1O5EQlEXdFcOGR0z4Qoauw8j2hHCKxwccoH7rlio+xOtTPQpOWySVOnV/j39NZxcivmYPkL6tYET3QJT9qFxV24TvLJdoZCRzxxBas6jqShrazYwrr3tJ4rFAiYDPAq1BUBlDE/NVaS/GvdpvjyZjelas/Hw31UaZHopxNyWLrt0bG6u65lKG1Elv4VrnHRr9gwCRfJxBwlvqtrAF9KWK0juKV5Lr+PNjlZQA8vjYPpEURn/KQuTLgoZZ85OeT/LPxD2gcq5g3PZECgxVAKvln5/igl0Fs2CWz3pof7Ef+UrzsvZyO1c03EXSU90TQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB0710; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13018025)(13017025)(13024025)(8121501046)(5005006)(13023025)(13015025)(10201501046)(3002001)(6055026); SRVR:BY2PR0301MB0710; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0710; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0710; 4:mULRv6poc+YCBgxzwr4cnpxow1UsiRHdABoHI8opOzIxnWICMHGc6MzrKB5EBHlDAJNr00iE+D5asgb5tZTz/cJ5QhZzT8FqwhYkxSsxs22t9Ys5IUXb0hNyepJ67nNnF3+Bqc42iIwBoOGNMsx7sIDdTdtwoRHEILauv2qnltXby07fNybb38ZIu7HgSt4ky2m1f8FBgZLSo3we4owG34mqf6gZmWseK7qitenfxnC8z5loG0nBOHEtUPJCdAnAM0h2JDE2T82gtXTqgmRdRMnFj5A14b6GUI+qjmk/xO2wXLd00dkmV1z6epuO0uy5nS/99W5X+8+cQccckJkz6ssZvwIwue8AuAhFE0FpDHn+howOHXJ5iuu/MifeqOjnqOgg5XVYL7lAxF5x+y9V2AB2w2sSdFS01RzElw6zIoT7T0g1HAvjorrswRdwS2fhIzujfn8QqYtXzcH8fAc/Xwcg+nP9WZcOpbIBDYVrpiM= X-Forefront-PRVS: 0913EA1D60 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0710; 23:pjLjP8plJzXEHa9KwL1IQuwu08oaKlYDv0S9yW3?= =?us-ascii?Q?/EZZtNiwtfsR5nuvHkFQwXhyxDXL6W3U0vndzuhvYaWsTpW/WcMgjZUs7otP?= =?us-ascii?Q?HG6UbfNw7n5wpDCj7UOwhTf1i1t1/tVGmPK5J6z6gu+Nx56DQw5BW8eCZN8y?= =?us-ascii?Q?4S804xDyimPsqgCGln9stGIu8zy2MPzWLwZa3pv45s8YwIiyyjfOBsDziF+1?= =?us-ascii?Q?JgZNrxTSbC8SCiG5YvWCTB1GQ+7vKGkwxLp3Ue/K+2mrXSRxTT9rrUp9zYSQ?= =?us-ascii?Q?L/7PwciSlK+SEi4t+1RTNQXHu9/DPuimlXlrNScpKdCvHz8T3LwAlbxJYW3Q?= =?us-ascii?Q?QReHzTpshY92c/Sd+q+fvsWAKYD/unVVE27Hr1lN9w6FmtVedxh2uNqeO2ma?= =?us-ascii?Q?29exNLEcBVjbNlo+1hTjMZoSz5Kml98srIFOLNR5l95WhEx6N45h8zi83kW0?= =?us-ascii?Q?uB0+XTp6k8XqP8p73e997A3g6SDE1+xCdEhtNb0T4xC7TpYvMfAm5fIfyulW?= =?us-ascii?Q?ugOKoxKvcvd+wg/yvAHYrs81MeGqq0auWMIcq0pt9TM0cF1vnaaxcCUcgwnk?= =?us-ascii?Q?eiTggOqQV3RS3LDcuJk0UMQOUVWkiAcwShh5HxFqSpfATkbRkpkImGpqUO6s?= =?us-ascii?Q?kulvru/A8LhEevXo+uLK1Baaoqu9wR4s7+yMnDRIJIasVJfFhTKnb4WBGP5Q?= =?us-ascii?Q?EWlI73Zow4HUrHaWdbFOHeCEt8ZlmL1Ay7ro8FaCHnvNlpPORFoxtnlOfXfs?= =?us-ascii?Q?7F54eSKrhc6KvYSyylq5dAU5UjcMX7EoGfxrLB26uWmoOXo7aLsSBHQRMAj6?= =?us-ascii?Q?iXkfaLcj3n/5IoYC6IQ+2Lh62HfjWUilUNtXrQ/NZJJYdRW+iOh4dRKAIfRW?= =?us-ascii?Q?HoOMJj0zvgARaJ/np7sCJBvvf0PKF64czf4wx2PtK0zoRm5jdjVi8wZ3SvKt?= =?us-ascii?Q?PB7EE06Y5VNE1rjGuOF3S/YhlILHscQHbNcmKhmy9pmf2SgGpvTV1K01FfmU?= =?us-ascii?Q?ZJi/z2S02C8eFqxeyT4gberMKTRHtA+g0ZNO5FpYRdziY0TtwxavESd7X0Kw?= =?us-ascii?Q?KQhI5qAtaUn6dcSS6f7Vo71lJg+AAsDjpyUNE0hNKq8HcuCGMQg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0710; 5:LP7jNB9aMJrSF0gqvD+xnWktMNrhL+KXcQpowK1JpkyXDA6JwQPImsokbkZm7UD7upRkhLD1at2gfhnN1Y2g2ZPe0kkZZauybJ4y4t3+X18dscYhxRD1pbkCZzOcinko86i5wFTVeW0Yhd6DdgE0xjoNa+GCDWgf1n7VE+jRjns=; 24:nzILv8EMllrda3lGU5nJCfkYFzIGiH7RJy84xmPYP84PeESPxrabRg9s6G26znzq6WwaL55WetCc+CNjAYVTV3Qv5agWR7ADsNh1ApUDYPM= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2016 17:37:30.7167 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB0710 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Rename ACMD12 quirk to SDHCI_QUIRK_MULTIBLOCK_ACMD12 to avoid confusion since it's needed for both read and write. Signed-off-by: Dong Aisheng --- drivers/mmc/host/sdhci-pci-o2micro.c | 2 +- drivers/mmc/host/sdhci-pltfm.c | 2 +- drivers/mmc/host/sdhci-s3c.c | 2 +- drivers/mmc/host/sdhci.c | 2 +- drivers/mmc/host/sdhci.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c index d48f031..1ed1f995 100644 --- a/drivers/mmc/host/sdhci-pci-o2micro.c +++ b/drivers/mmc/host/sdhci-pci-o2micro.c @@ -162,7 +162,7 @@ int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot) case PCI_DEVICE_ID_O2_FUJIN2: reg = sdhci_readl(host, O2_SD_VENDOR_SETTING); if (reg & 0x1) - host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12; + host->quirks |= SDHCI_QUIRK_MULTIBLOCK_ACMD12; if (chip->pdev->device != PCI_DEVICE_ID_O2_FUJIN2) break; diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c index 072bb27..206057a 100644 --- a/drivers/mmc/host/sdhci-pltfm.c +++ b/drivers/mmc/host/sdhci-pltfm.c @@ -74,7 +74,7 @@ void sdhci_get_of_property(struct platform_device *pdev) u32 bus_width; if (of_get_property(np, "sdhci,auto-cmd12", NULL)) - host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12; + host->quirks |= SDHCI_QUIRK_MULTIBLOCK_ACMD12; if (of_get_property(np, "sdhci,1-bit-only", NULL) || (of_property_read_u32(np, "bus-width", &bus_width) == 0 && diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index 70c724b..756b9bb 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -564,7 +564,7 @@ static int sdhci_s3c_probe(struct platform_device *pdev) host->quirks |= SDHCI_QUIRK_NO_BUSY_IRQ; /* This host supports the Auto CMD12 */ - host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12; + host->quirks |= SDHCI_QUIRK_MULTIBLOCK_ACMD12; /* Samsung SoCs need BROKEN_ADMA_ZEROLEN_DESC */ host->quirks |= SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC; diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 96ccb15..40e3551 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2988,7 +2988,7 @@ int sdhci_add_host(struct sdhci_host *host) mmc->caps |= MMC_CAP_SDIO_IRQ | MMC_CAP_ERASE | MMC_CAP_CMD23; mmc->caps2 |= MMC_CAP2_SDIO_IRQ_NOTHREAD; - if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12) + if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_ACMD12) host->flags |= SDHCI_AUTO_CMD12; /* Auto-CMD23 stuff only works in ADMA or PIO. */ diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 0f39f4f..afa4de8 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -379,7 +379,7 @@ struct sdhci_host { /* Controller is missing device caps. Use caps provided by host */ #define SDHCI_QUIRK_MISSING_CAPS (1<<27) /* Controller uses Auto CMD12 command to stop the transfer */ -#define SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 (1<<28) +#define SDHCI_QUIRK_MULTIBLOCK_ACMD12 (1<<28) /* Controller doesn't have HISPD bit field in HI-SPEED SD card */ #define SDHCI_QUIRK_NO_HISPD_BIT (1<<29) /* Controller treats ADMA descriptors with length 0000h incorrectly */