From patchwork Wed May 27 10:13:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 6489121 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C2FD79F1C1 for ; Wed, 27 May 2015 10:29:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D79812069E for ; Wed, 27 May 2015 10:29:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E78232066F for ; Wed, 27 May 2015 10:29:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751418AbbE0K3y (ORCPT ); Wed, 27 May 2015 06:29:54 -0400 Received: from mail-by2on0106.outbound.protection.outlook.com ([207.46.100.106]:25664 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751234AbbE0K3x (ORCPT ); Wed, 27 May 2015 06:29:53 -0400 Received: from BLUPR0301CA0023.namprd03.prod.outlook.com (10.162.113.161) by BY1PR03MB1420.namprd03.prod.outlook.com (10.162.127.150) with Microsoft SMTP Server (TLS) id 15.1.172.22; Wed, 27 May 2015 10:14:47 +0000 Received: from BY2FFO11FD042.protection.gbl (2a01:111:f400:7c0c::141) by BLUPR0301CA0023.outlook.office365.com (2a01:111:e400:5259::33) with Microsoft SMTP Server (TLS) id 15.1.172.22 via Frontend Transport; Wed, 27 May 2015 10:14:46 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; lists.infradead.org; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.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 BY2FFO11FD042.mail.protection.outlook.com (10.1.14.227) with Microsoft SMTP Server (TLS) id 15.1.172.14 via Frontend Transport; Wed, 27 May 2015 10:14:46 +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 t4RAESMZ006521; Wed, 27 May 2015 03:14:43 -0700 From: Dong Aisheng To: CC: , , , , , Subject: [PATCH 6/6] mmc: sdhci-esdhc-imx: add quirk SDHCI_QUIRK2_BROKEN_HS200 for imx6qdl Date: Wed, 27 May 2015 18:13:31 +0800 Message-ID: <1432721611-31214-7-git-send-email-aisheng.dong@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1432721611-31214-1-git-send-email-aisheng.dong@freescale.com> References: <1432721611-31214-1-git-send-email-aisheng.dong@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD042; 1:ODqO9xeuQCQDRjbk1CNX5DccgCpejt7nnTVLKcuCF3y/8rR9SJPYmUIiitmGvXf69rTzeLu7CLOzIXSc+mia0j6RBn5NIfkYDDt24yvisqxTIp3n5OuwAV3R8jpy0N+Xspt/yrU1/uVfCr8SPo219fjEtz5rIkPaPjyCpw393R/9aLi+m96C25wk+nDOJ+oNVnBWCv+mT3pDZFux1Lbuw1VbLR4mMONyC5oG1INvs6o3W5ZWGUTouNKfLwcrxBwUPvxSerxNbTqWvLFrhWxihgLhfGZtzHYiryLWNjfpc3ZgHP7Miw3CdC5n7bR0U9rxLCXCbrlxoeFwMRq9OIYArw== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(979002)(6009001)(339900001)(199003)(189002)(33646002)(86362001)(6806004)(4001540100001)(50986999)(77156002)(62966003)(5001860100001)(19580405001)(19580395003)(48376002)(81156007)(50466002)(575784001)(64706001)(69596002)(2950100001)(229853001)(47776003)(85426001)(87936001)(36756003)(105606002)(50226001)(230783001)(77096005)(2351001)(92566002)(97736004)(68736005)(5001920100001)(5001830100001)(106466001)(46102003)(5001960100002)(76176999)(189998001)(104016003)(110136002)(32563001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY1PR03MB1420; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1420; 2:0KXHX+YaaY6g4TiNNwU08poPCK+vnEwj4QxDS3U7nxq4M8zIkVYmRPdqmPDnm6qY; 2:IXSwxeMqQLASKYrksFV4s6o7UY9Z3/WAz+AGozSwmaBIA9gLDqmAOVlPR9wAukwfxhbcM0OArZPi/Rk0+Mv/vk5yNhff08inbSsdyoMEGEEe4nZQqkTLnUI64eIgncCVKmdynqXK7pSdtqv0tWYYhw+6w/zurmbfXPDeEJmq/yBAO8bcBMVhB7IVKNCBRRyqczj/WHeuT4fQrDI6U60ZusET/ZIQST7ZixPx+KZDyGE=; 6:U3y/ebETF18lvPfBbmuQEGQCX09buZywiKiRhvcwafTVDH1hYCC4uoGUbAum2zmK2rkn65kWkHHpWZ4OnXI+AIhv9hmoQJ+CFUFVA9gpUsODuqz6VBnwR68ox5/sWo9KntKDcxeC2mVE+3j4lQMu99U8OZYmH89jEpKAqKO2Ak+5xybjn4HzsRPVPfpOn/uVh6H7OrRr9jmp6jfrRmGcEzZxn9WlPkYZdsZe5cFLkx6oOdgx2s/RLdKaQQFt7yRJ/ELW0sYTtagR+sEwyxh1NPGDnGv8fKjZfQV/f2fxTNUavHLGt7ygoPRPaeQ0iuI5CQNixPPXO3rek8S1E2qzwg==; 3:5toArTdZ9dA3YgBw9qeUkYb4fnYgFE9PRxo7fgdxiGfAYnRkwLnzkaHJ9zS9H9V+K7eMcj2sMuA1p/JpkuOU+E9fDP7qAjrUr5us68V6ZXIsQsIdM9ospwG0Mwtsz2XLZ8lfI04QCTzIGX1fTWQznSXI8FisVuD69GJL9X96QxeC3H7dCFh6p+cf4gSR8Rjly+7dGDvSEzSCfKMYOP8fVdkyYa6ej63f6qU2xZvvfAvmZeq7zatUXIZD8pBPkiQnBQ/e+zXhRCQP05baZtmsFv3jqoKkD L2U0RmMhAxROl/V7kq4Lp4wQ1HODr0c9mvH X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1420; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:BY1PR03MB1420; BCL:0; PCL:0; RULEID:; SRVR:BY1PR03MB1420; X-Forefront-PRVS: 05891FB07F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR03MB1420; 9:H+tm1yLgW8VCfIhHZ0pyJsh6s9jT5YlOyRDUEzMqOE?= =?us-ascii?Q?QapYOkZrHIuPTINbKmEKX/I8AsD2BzrFCE7dyBQSrHVvAp5g5qV21vnz/LNO?= =?us-ascii?Q?gSMFTWMepr0E2eGjWNlIOhZzqNi1KNRMrvUYHe/u2ZxAFzYykcRJm99PH0/v?= =?us-ascii?Q?OhvlmjvXPt4a1DiVoa1vm3Ua0In6Pgdgw43C7vOjCKbK4ymNTGrl6GhukM52?= =?us-ascii?Q?r1+uC0tl06PmyYzSoQfUaN92VfbzGf7B0Gqcf2gtJFPXU3gHKOsvl9YarO2H?= =?us-ascii?Q?ImD4wjo1DwFs115PrKMR9vufEw/JGnHUV6OHGW71hZIbLLDLRgc/1hU+65v4?= =?us-ascii?Q?enEp2BMnrdovWc+YvZrmwZdQpgJMh07oT95xllxfHnkLHWKWJAU2QQq9xbW7?= =?us-ascii?Q?tQL+xlOd3Fh9EJMP999yRxLujvx17FZTVCawaWZKVCix6QMpuWe+s22XrvmP?= =?us-ascii?Q?sjq3sjZ/J4TKAXtngukkkOcOcoEzIVnLf3nGDWlSRn4x8N4YUiARVQpXIBMY?= =?us-ascii?Q?U9uJzy6LEWJJxOENA/5cYQVTVxghig1on767jbNiw5LhM8wEL7GIWIzdcM2U?= =?us-ascii?Q?/II/SgItpNdft9MrdtNwoLWI4MaNm4NZVdS+Q/YF8YnOzMEiGtguvPE5oRHM?= =?us-ascii?Q?Bcap+QBifTAWl5qxktwrbbLBRVnDI/vIntYudX0PRgL7czMWtGH4FQZWHRDK?= =?us-ascii?Q?/SQVBG5lXc1dH1azpNIVVZ2J3INxzTnON8xdwAVsaF6XyZFGDOUzjWkramYY?= =?us-ascii?Q?dUFDPsLPvLVVhFD1CeTmDkMQme+ER1Eb2riKwX5dEWs8uxPqdahzPcaDPTQI?= =?us-ascii?Q?J41mZAp5S5ySvB+qDOr+3eLYI/e0tzklUqxfzukQB3zxrVUvK4jI/JFmQFCH?= =?us-ascii?Q?mkSP/2m4/2CCUpzq10gxdt7D34kIq+4VCe1AcZPEBL/jhgXQ29pcqrlk8Gy4?= =?us-ascii?Q?qKrhTo3+7VqLSqXJrc1PtPrMfAf8Wr5w9/eVUNqqCZ4osC1YC2N/cSPnyf/t?= =?us-ascii?Q?drZOidTJzBDHHZMFU6k14Yl/954jR8HXA64ovtlXpH+VP35H7sklBFG7bAo4?= =?us-ascii?Q?oOXIGxutXM/wrCNDqlREIBLnXjMwZHf1pHNkhOKlOZDOuuxX+WN8gQWvjRpT?= =?us-ascii?Q?1Ho7OXp+DOOsH8DYrtmcU7TF01TDfHn6/73T8gGFFKTczTXM273r8PUTr4yg?= =?us-ascii?Q?xuwC4jBJPDiqpu0aOqh1ehv2n9nQ4lB5bWctq1wMaoZPEmw04ZFSCyxpxIVu?= =?us-ascii?Q?/h/BSXywDGPN6gQY4=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1420; 3:tY0+fk5mrWQk88WdpHpW4bJ27SfC/yXhOKqoR0ZE3L9quy5pzMsOmNLmJqnviGKPAaWXFUtCGpw+yDDO+7HGRRl3sEaQR/z6shS41QQfANF+oBxmFAJsU47cKa7k6xaqFCwEocGc0KQsJmollSazSg==; 10:G7B2RC7wNX7zd9/jYzvWkZUH5zxWP6Q6jEXpL7bxRzkD7fIxHVaWdaO3h1QhxEa1eVDozUKEXanVAqHUc7eWNS/8AFPoEdxqH9OpW8gS8uk=; 6:znj6cK5BYKR3z+S1h6vhMk6Ac04uNwvx7HiKuVLjk2YwafQUpBe2x6VPmfyznzCd X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2015 10:14:46.0946 (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: BY1PR03MB1420 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 The iMX6Q/DL can not support HS200 mode while iMX6SL and iMX6SX can, so introduce a new flag to distinguish them. Signed-off-by: Dong Aisheng --- drivers/mmc/host/sdhci-esdhc-imx.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index bcb5673..faf0cb9 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -118,6 +118,8 @@ * when reading data from the card */ #define ESDHC_FLAG_ERR004536 BIT(7) +/* The IP supports HS200 mode */ +#define ESDHC_FLAG_HS200 BIT(8) struct esdhc_soc_data { u32 flags; @@ -145,12 +147,13 @@ static struct esdhc_soc_data usdhc_imx6q_data = { static struct esdhc_soc_data usdhc_imx6sl_data = { .flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_STD_TUNING - | ESDHC_FLAG_HAVE_CAP1 | ESDHC_FLAG_ERR004536, + | ESDHC_FLAG_HAVE_CAP1 | ESDHC_FLAG_ERR004536 + | ESDHC_FLAG_HS200, }; static struct esdhc_soc_data usdhc_imx6sx_data = { .flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_STD_TUNING - | ESDHC_FLAG_HAVE_CAP1, + | ESDHC_FLAG_HAVE_CAP1 | ESDHC_FLAG_HS200, }; struct pltfm_imx_data { @@ -1004,6 +1007,9 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN; host->mmc->caps |= MMC_CAP_1_8V_DDR; + if (!(imx_data->socdata->flags & ESDHC_FLAG_HS200)) + host->quirks2 |= SDHCI_QUIRK2_BROKEN_HS200; + /* * errata ESDHC_FLAG_ERR004536 fix for MX6Q TO1.2 and MX6DL * TO1.1, it's harmless for MX6SL