From patchwork Wed Nov 25 02:05:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: yangbo lu X-Patchwork-Id: 7694831 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 1DCF1BF90C for ; Wed, 25 Nov 2015 02:12:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9703220846 for ; Wed, 25 Nov 2015 02:12:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B03D620842 for ; Wed, 25 Nov 2015 02:12:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754796AbbKYCMv (ORCPT ); Tue, 24 Nov 2015 21:12:51 -0500 Received: from mail-bn1bon0134.outbound.protection.outlook.com ([157.56.111.134]:46464 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755147AbbKYCMu (ORCPT ); Tue, 24 Nov 2015 21:12:50 -0500 Received: from BLUPR0301CA0023.namprd03.prod.outlook.com (10.162.113.161) by BY2PR0301MB2072.namprd03.prod.outlook.com (10.163.197.14) with Microsoft SMTP Server (TLS) id 15.1.331.20; Wed, 25 Nov 2015 02:12:47 +0000 Received: from BL2FFO11FD053.protection.gbl (2a01:111:f400:7c09::120) by BLUPR0301CA0023.outlook.office365.com (2a01:111:e400:5259::33) with Microsoft SMTP Server (TLS) id 15.1.331.20 via Frontend Transport; Wed, 25 Nov 2015 02:12:46 +0000 Authentication-Results: spf=permerror (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: PermError (protection.outlook.com: domain of freescale.com used an invalid SPF mechanism) Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD053.mail.protection.outlook.com (10.173.161.181) with Microsoft SMTP Server (TLS) id 15.1.331.11 via Frontend Transport; Wed, 25 Nov 2015 02:12:46 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id tAP2ChR8015500; Tue, 24 Nov 2015 19:12:44 -0700 From: Yangbo Lu To: , CC: Yangbo Lu Subject: [PATCH] mmc: sdhci-of-esdhc: add/remove some quirks according to vendor version Date: Wed, 25 Nov 2015 10:05:37 +0800 Message-ID: <1448417137-6185-1-git-send-email-yangbo.lu@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD053; 1:l+WwSeoAsMzViap3UyVoJa5i+60/eOHf4Q6c6ZVtHnLioZceVRfjzdHas9kO5pMvYr9RXx0gbjam+8ws9NSVeXd57I2DxFatxI/JuhOlQYCggCv6NPxjUZHNsxlbJTx3ZePBYdAyxsHgrtVQMoXe4w55zq3fAvAptjQjMyrE02WxLUvQGqHT/3j/uP61w1EM8UmHuMWT4+SZrpLUDlPO4cxF1Se/SF+fiZDyJkjLHG6PtLHUfEhP450j4y5y3O1dEnXIAnSoMv0XQzTjZ6C4aVYM6AG2j7G8i9uPq6ANet37p/XXRPEvHlJTYOKHoavkKVEPNti9hslGkKaCesqcuFquZZITpKL9QwScyN2NAkYYzjjER2DgAM64eY6WOnwBfjaK/MTJnAYPhxfgHt1z7UAg8iZ7lA1iX3VTXrqZGLScMGl6t1ekZvNoEvNEs/44pZk7s9kc+SIJDYumHP/g6w== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(448002)(3190300001)(189002)(199003)(104016004)(77096005)(229853001)(50986999)(86362001)(189998001)(19580395003)(230783001)(107886002)(85326001)(5001960100002)(5008740100001)(48376002)(81156007)(50226001)(11100500001)(92566002)(50466002)(19580405001)(5001920100001)(5001770100001)(5003940100001)(69596002)(97736004)(6806005)(586003)(106466001)(87936001)(4001430100002)(47776003)(5007970100001)(36756003)(33646002); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR0301MB2072; H:az84smr01.freescale.net; FPR:; SPF:PermError; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB2072; 2:emb6KaXrK4MHjlphtASaamZPWe1DuWAAdKlUSXqTTBYP2fziToNgZX7a4+ufKxLzfCYchE92kB0Nq21WJKg7jyubRu6yhblMVdP6iCB2gr3YLcdSNRhrRCWuWWZczVUlZjzBjNBQyhdrootB5DLDpg==; 3:BaycPOHCctNR9LI9gxaxYIiwmN3wbqpBeKyEi6K7cPLqazJ9FxblGKtEppqvKrW2THsnUJW+BhIX30GNz3GESE8tlGsSlFEZzgWAQIFx80qa7OKwn0CqRj90sqtT17pOjF6mjqPDnFvTlJoGbob/EIP5rTWY6Ea2t9vRYPAgqbR2EtHUU6gfZ7FXiqbSGJGN3RQ+OD0b1hWi6xxBUgAytEEwOyY0YQVHiT4/tgkR0ck=; 25:TfWQphezjh3zM0omxZmt8TvQOcCXRvXkXl/9WrPD7MLqqw+ldSZuAMQ/IGkAHUZysQUL8UFax4nFllePv/lk31H2FjuCtSvGd3Ub8fFo/T/qy4iu8LiAuEjI8Mp+8nCFpfbU8xkkzG93IRvusYqgMq1l69VUesHYbgidDBaZGxI76Lms5WggO8DmGCXN0AQ50NBGkBR4DzkfSdse9qyeRRV5eyuaObninXwGhIbaorFU1ZKw83H8xM51CmoQ6Y1Y3w4N+yTZUt8ebBcV1suy7w== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB2072; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB2072; 20:xEXo/uYcXwhgE8FPhVx7qUFghmjI7gWwgMCxZ1a+ZwhR2XE3BhcxNoebCUkoLkzgfi1KYTj5c4KwJ5gxjVrQFL8nl/0VPljBmfY7RONz2pqr0TAqSY4PJ9e0ivoBiWLGnCtQd/P0u3yoRhmX+L2knyKMW0XKMrIU3FmphdzoUlFlipPDmtUs/j3BjcuzLxLdnpB8Qo2Iv9FeW6eURL1qgpAOaONkMG/79fN3hL2wM0idJMvbue2H6D/ja5BvBqUjSrAsZBCxccqXFLLlXZkcvqHf1AJ/tpPFyPMs2XYQCFiwVAgpDsWBKmG1RRLtCq/wjfG9BT8Rj+25etAbSGiRDAEsY7mg2FPbJnZ4WnJdb/Q=; 4:0rOv6KkZmfGkGiJc73/AKHNFekzWOe8aSkrlTlDRx7foisHnVGnfsmyrLxSOhiucX9pEIoieMYzYIZDZwYLJ4xsrpvkSnEKn5L83R4QdGwZD2Wc2H1bg6RN0IdtW+RUiQo5O3PcUG8tRVxPzxXWLmQeuwfFraYbPxwxooAoBd+l/DfcCduBvrxp0JP/mLI2eLnbuiTgexipt/joNPmw13iJurlfvPYrz3srgqmMaYzKLDYhNjJN3MhGWLZ1dhcF+ETMKOgoSBll/u47wBkN5LG1i1ZDsJK6f+rKU9xN2qCxRQD7PYnyPFre+4PUWdXOZYu2SfN16c+Dl8lfwmgVWUArrF1k26Bm3uZN194KbuVtjaDP00T7jCTArhM9awDTktEhQUZtC3ODNtnBNX6ESc6s9m5RXpL1o/p3rC2nFt6AsO296DQ25HFrn5KcW3e+r X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(520078)(3002001)(10201501046); SRVR:BY2PR0301MB2072; BCL:0; PCL:0; RULEID:; SRVR:BY2PR0301MB2072; X-Forefront-PRVS: 0771670921 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB2072; 23:oZNQdYpp86wcOBPwBkHxGJAwNYDi3666mfJG3Oc?= =?us-ascii?Q?pI6iUIRUuU4lsezAah5iwCFpycKP06leQf+PPRelS821tZeUuIGfyGm+VjnA?= =?us-ascii?Q?Z4x16Sk5/7iyZUHqOI9y+yXBTuUP4j2DqTMzv4nSB8uc2hEn1ApmRut9haNS?= =?us-ascii?Q?9Mk5+bTyaiMGWf5y4hhTkRZ5PDlBTqkPJOujuJgoZAHL+7rq8QKKYX4RaEyx?= =?us-ascii?Q?tpLmoCdxGoHXUrvVNlnYu7vnmfl0Y22GB+VOnZZYGUyq6ZQpISz5JWgQ6QIX?= =?us-ascii?Q?ZD2Bl+1R9TBBAf6KOU4+B2gPudPQaRM9QnJF/tWQ1LKcokqM23/yQZ0aD8bV?= =?us-ascii?Q?JlYFWFLDVYUVgAPxX32hOVzOq4LrdDykSe/n9M8kurCbhS7PLunBGINFKa9+?= =?us-ascii?Q?j7xh3dEI3j6ydjf5PAxa9WyVDHTGfxqikpn6yzHXg++LwiIrYJQ/AADDKNMw?= =?us-ascii?Q?ylwclbBdLxCf7Hxif4wuW6Y2agJYbvzjg2aHH5vFeIDb7bXHUtQb6wAI8Y63?= =?us-ascii?Q?Q0pWyQz2+jOMRGStGjQivwJXHtGeA70R5wcd1AID2L2pAWTwQDgSmYF2Mpjg?= =?us-ascii?Q?umXHEuuMnxGUJzfvsNp7ngdPg0/Hi4zA1Y5q3b81ZApErHXkepaGPGmMQDse?= =?us-ascii?Q?EteolIdXnlNn43cOXxO2jlcg0zQ94PvyoGHHU3SY8JQ+IAa21CIy8WWgjxVK?= =?us-ascii?Q?DqmYjvtydyzGIQn2tera79oooEy6/NQBrCXHJLohLj0GOs5plw6V9E9KSsI4?= =?us-ascii?Q?yIzyiCoYE3rB286RdMBw82Rfdgl3MDzdb4++7fiSPE8+sBIQGKouQXe0YAcM?= =?us-ascii?Q?71P3ZMNYEgV+DGIpnrul1EIfRFTERTNIsFTWvLhGXSJ7NNU7DS2d+Zz90v9N?= =?us-ascii?Q?3zTsFbgEKxNQzyxNMVWNX6c7bWZyuimXeHryVa9wbCQSapxmCyFGEWdaSBZe?= =?us-ascii?Q?Dyi4WMugctJ5ZqYO3w1tOcke44q+dZr7oaPW/DZQzFU+Qdnt0PzK8KcBeD38?= =?us-ascii?Q?twJ1jAswTiagimQmveiqiKpzoVUtsq2SzQgdjuyGWMCd0cO2ChMd5AfweAGe?= =?us-ascii?Q?I2eRIyG27lljnCc/FhwFPrxudpelI?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB2072; 5:B7x75IJnk16KRucD+MgbG32Pj4Vkc3o2xVXkExRSKq6FQeweo78/z/83BT5c9TlTQDFxb3HcBmCOSysYXevHY2u3eHFp1kM6mx2AopD2C8Vj96GF0qCIRLKuY5sEzR57GHqWg+dl51CbBIiONn9PaQ==; 24:acxKcJemx8IFxVhYMK3ctLTAs4T938xekeOFUoTT2JbN2sLIRvqNRBjNHM6BqJNfolo/6JEGsel5khGgmymgrxiLcMKMI5zx77xESIG+Sa0= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2015 02:12:46.5746 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB2072 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.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 A previous patch had removed esdhc_of_platform_init() by mistake. static void esdhc_of_platform_init(struct sdhci_host *host) { u32 vvn; vvn = in_be32(host->ioaddr + SDHCI_SLOT_INT_STATUS); vvn = (vvn & SDHCI_VENDOR_VER_MASK) >> SDHCI_VENDOR_VER_SHIFT; if (vvn == VENDOR_V_22) host->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23; if (vvn > VENDOR_V_22) host->quirks &= ~SDHCI_QUIRK_NO_BUSY_IRQ; } This patch is used to fix it by add/remove some quirks according to verdor version in probe. Signed-off-by: Yangbo Lu Fixes: f4932cfd22f1 ("mmc: sdhci-of-esdhc: support both BE and LE host controller") --- drivers/mmc/host/sdhci-of-esdhc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index 90e94a0..83b1226 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -584,6 +584,8 @@ static int sdhci_esdhc_probe(struct platform_device *pdev) { struct sdhci_host *host; struct device_node *np; + struct sdhci_pltfm_host *pltfm_host; + struct sdhci_esdhc *esdhc; int ret; np = pdev->dev.of_node; @@ -600,6 +602,14 @@ static int sdhci_esdhc_probe(struct platform_device *pdev) sdhci_get_of_property(pdev); + pltfm_host = sdhci_priv(host); + esdhc = pltfm_host->priv; + if (esdhc->vendor_ver == VENDOR_V_22) + host->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23; + + if (esdhc->vendor_ver > VENDOR_V_22) + host->quirks &= ~SDHCI_QUIRK_NO_BUSY_IRQ; + if (of_device_is_compatible(np, "fsl,p5040-esdhc") || of_device_is_compatible(np, "fsl,p5020-esdhc") || of_device_is_compatible(np, "fsl,p4080-esdhc") ||