From patchwork Wed May 27 10:13:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 6489061 Return-Path: X-Original-To: patchwork-linux-arm@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 45863C0020 for ; Wed, 27 May 2015 10:21:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 678062069B for ; Wed, 27 May 2015 10:21:25 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 78B5C206A0 for ; Wed, 27 May 2015 10:21:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YxYQN-0005Iv-6K; Wed, 27 May 2015 10:18:59 +0000 Received: from mail-bn1bn0108.outbound.protection.outlook.com ([157.56.110.108] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YxYMh-0001tb-Oy for linux-arm-kernel@lists.infradead.org; Wed, 27 May 2015 10:15:13 +0000 Received: from BN3PR0301CA0029.namprd03.prod.outlook.com (10.160.180.167) by CY1PR03MB1390.namprd03.prod.outlook.com (10.163.17.12) with Microsoft SMTP Server (TLS) id 15.1.172.22; Wed, 27 May 2015 10:14:44 +0000 Received: from BY2FFO11FD023.protection.gbl (2a01:111:f400:7c0c::149) by BN3PR0301CA0029.outlook.office365.com (2a01:111:e400:4000::39) with Microsoft SMTP Server (TLS) id 15.1.172.22 via Frontend Transport; Wed, 27 May 2015 10:14:44 +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 BY2FFO11FD023.mail.protection.outlook.com (10.1.15.212) with Microsoft SMTP Server (TLS) id 15.1.172.14 via Frontend Transport; Wed, 27 May 2015 10:14:43 +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 t4RAESMY006521; Wed, 27 May 2015 03:14:41 -0700 From: Dong Aisheng To: Subject: [PATCH 5/6] mmc: sdhci-esdhc-imx: add imx6sx support Date: Wed, 27 May 2015 18:13:30 +0800 Message-ID: <1432721611-31214-6-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; BY2FFO11FD023; 1:M4eXeTVXQLIfsu/Jw9EdQ9rv8p6RX9I3Pocm0jXTYbEe6UoUU3s9q97teKs8zQV3uhc0r/ZnzhZEkjJlF3Z63ihShbvSZFUcqGvMZk2GNdWgYMdvwqr2LjM/VcWoydwQXJewZ8Nag2116CQL11DedyzTdmJndOrb66G7aLkFQT0JvjEwFGnxAHN83Ln+QRx2ThzJYD+qxIpHu5UJWk1qAOHgaLqlkeBk9U2stzrW9yS9dgelhsxMYRNerwpTAOW2AILFWTpTTE/Hnx8THYPo492Z7+AuCJvKYgdVNr/Z68g/xPsB0yzE7FYzC/pPtEklRgXtq3ANxoQNxuCjFJrqlg== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(339900001)(189002)(199003)(47776003)(64706001)(46102003)(36756003)(50226001)(50466002)(106466001)(2950100001)(87936001)(86362001)(48376002)(68736005)(76176999)(50986999)(62966003)(77156002)(189998001)(92566002)(105606002)(77096005)(5001960100002)(2351001)(229853001)(104016003)(230783001)(5001860100001)(33646002)(5001830100001)(110136002)(85426001)(19580395003)(19580405001)(6806004)(69596002)(97736004)(5001920100001)(4001540100001)(81156007)(32563001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR03MB1390; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1390; 2:qwFWqHEW5LLyEm5tnRlc1kgN+yP0iqFWfZ47TOfS0sdBgIU+EFOkg8kWaoetPOH2; 2:X6LC330HD7REmlym1a9J1sETg5HM76/RjhV7ZZ7qjFLjYbN9SQq61bFl4yDO877Xiin6s8jmmRW7sF8Ye4OF7C4y6oEP1DOKC+Bd4He06DWwH6dPZ9wnGvwQkXJgFhH0o0waqWmlbcheOhuiTUOatNmnUHZEYmE0NuY+xlF2ah3xZHhcHnJuxUwsTxsOGJkzkr2EFXZBKM9sHR0xrI+n2GYu9IVtxqB5emDUc/NhcOM=; 6:h/WtxFbgmFlltqg/WPkiqav63EidmG49bqURF2cHHUx7HRkhJqSGzZA7lP0sx+UMKevFtSYmKE/e1r24sMxAmWd24f4Hic2QxnfRDZruXW36IrNS6fKyRlx6PSizmMSZxo45On/sa8QFaQMrHpZU9PB+VzPA2D/qEcZrueNZGyOq+MkKiAaocoq3IFGXQIA0nHB5JBMx4WWA9CzAN+YsKtcVc9D7fjD/QJ924eyOfyFKcQjOGI16AncVs00ZaYKNn5aivokRN++cAxotlVG2bGwbLMre8/4gr4WKm37TeOgcEI12aullU0VcSxxsjaxuj2m/DBLxB9FE8mbBnRN6jg==; 3:73l/E5z67Mdv5QFpV8Or0nrcAD496JBYxUp3hKqS93w5b+qNDH/Rujt+StaQwYo6GGaYcfYMNqZi/N6MJjqZ7mdoCOFoj1PAV01FCdd8Kc5H3Ot1mis7A4aEre2pOuSDekm1vNGa9ZGBqbjOnZuKr2Us5fj40mWS7uh840x0wMLoO7QHcJnk+tfvQvx70xwAU602YgNP43lkaUEwtBc5JbhW7c4E3y8oq+pTbcBtT6GccsRaUl6YMcN2yRy+zoKMXGAT8nZqpoEje5pKnkTCLxhSNIGBycKxClcOYNMn5hv1d31/uU5y1pEXSfNJIU3X X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1390; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(520003)(5005006)(3002001); SRVR:CY1PR03MB1390; BCL:0; PCL:0; RULEID:; SRVR:CY1PR03MB1390; X-Forefront-PRVS: 05891FB07F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB1390; 9:ptWpKGPKPG8VPwPWydpQN6AXh3ylND4Q2EEWVVLydo?= =?us-ascii?Q?Yf+Ejau9EgUxU2/uBpQ5hARvGZnD8JD4Gno+ZXfYBVqaMs7FwtHaG6yqXAjm?= =?us-ascii?Q?bFMhm0ZiQgeWBmlGbwdJI1Z4yUApsTaX89E/NnGlLlFcteJQL3WoI/MYHlyw?= =?us-ascii?Q?p76YQOOFnrCJopLenLPBwi505SC8qvdXZ8N2jfNbgsPDNIPOpt6zrLbeMU3X?= =?us-ascii?Q?HK2+O5eUe1EVRHgKJCIK/8yd+YpmyFyHHEw4abwc0aBV4s20r5IZr3QT0Keh?= =?us-ascii?Q?klxB0wDcDnuMvPzmJoDGUZr53X6uXjB1Mw3Dmj+BPqTOnx1ib5gKdQcVp+NP?= =?us-ascii?Q?i5Ln8oI09S8JFd0cUFA5gj5sktMjh+vmZK0qr1v7C4IY9uxEYNOM1jx8QQcR?= =?us-ascii?Q?lUfkcMux/2/GkDA6txzSw9nCWVizYt5eVpoZp0MFwSDQIs80+Tv/d6yoWMBl?= =?us-ascii?Q?/eUDi6VOK9a5AQG5LDt2Jdkk17DQ5epVQPr0ts64lM+gVnJlqVtn3CAouKRJ?= =?us-ascii?Q?X7rWdKDJxn7B2PoWRv+4qdBNqI602PpCc+cHWZMNglTVaNmMbACXrTY34ke6?= =?us-ascii?Q?TcCQ+K0dBm/WaJ7u6zhU5HX1E5o3oGmN9rIkB43+h+Bz8Lwxieu3UR1IbSev?= =?us-ascii?Q?oQNiSPZjz65U8k+/ysdt/6ZVUOb+yU2RhhyesXz0b7LkjCN4wu6PA6O/RCvx?= =?us-ascii?Q?PKgXxWDB/m/zAD2m5ANsAUu4el/Ko/g7Y+xqwmdzpeEBO6j70gCbZLsBZrl9?= =?us-ascii?Q?u3xnr7SlIE1Rz1WTCTfEn6rDlZkSJ2YHo8vMsXnpaUkgSmoEmhu/O2Z2OMYn?= =?us-ascii?Q?ZUVrH0dfxHsBcSG/TQecOa6Jy6KFDGvc7hLdq4SgDc0hSe90BsU09E+0LiwG?= =?us-ascii?Q?6yI7K/ki2GNCsI6vAxwDRi37nTn/JNYaUixoqnCl3NxSiiYY+OKBixZgW/N8?= =?us-ascii?Q?OLw3+JaVmeAUJK3p0txY77dWWM9PbnXnIeH1BDOiB5+mSq1O/AoHsADMHN01?= =?us-ascii?Q?/zFQ3YIvMbFT7YUUm0BA/WI/usgB+l0QoXuTXbUZjXfaHKWN8Nf4lmN3tw+Y?= =?us-ascii?Q?tpYukPmaxGxlZ0tA/og4QjidJnwZFxcW4xZjYcAazAgQWFQfAbQR5hbVSGaJ?= =?us-ascii?Q?N3a8f+y4LKzge0fam//U5rM7GtUKs2?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1390; 3:bBpWyVQ/03kvQp1C5nrfrftDA8+9RwfnRP+CD8kSdsIDrDiRNaS+RZjfXkClqEYBb6izgCOQTKFtGGLKPXcpTtq+v6ADfc1rNheHw1yHO+ZKuf8ONNweptx5DeSANqufCTbTLmk3oIvYfO3J5V0rrw==; 10:gVvdroqNpbINTzT1TapL5XrEFkEAVwaXHn3LeNLtadbE7MBECndQml1639dViuEsnHkRye7OAXkpFn6gz9g2H5p5MnWLor1cHn597GCPdQo=; 6:N3N82dXUrC+SxlgrKpKLB8v7WPCxFV04EHnjoxTD2+ANEFEexJExOBgNEqF8HHP9 X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2015 10:14:43.8001 (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: CY1PR03MB1390 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150527_031512_244828_B8D1CA31 X-CRM114-Status: UNSURE ( 6.83 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.1 (-) Cc: ulf.hansson@linaro.org, chris@printf.net, b51421@freescale.com, shawn.guo@linaro.org, b29396@freescale.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED, T_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 From: Dong Aisheng The imx6sx usdhc is derived from imx6sl, the difference is minor. imx6sx have the errata ESDHC_FLAG_ERR004536 fixed. So introduce a new compatible string for imx6sx to distinguish them. Signed-off-by: Dong Aisheng --- drivers/mmc/host/sdhci-esdhc-imx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index a3b82d1..bcb5673 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -148,6 +148,11 @@ static struct esdhc_soc_data usdhc_imx6sl_data = { | ESDHC_FLAG_HAVE_CAP1 | ESDHC_FLAG_ERR004536, }; +static struct esdhc_soc_data usdhc_imx6sx_data = { + .flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_STD_TUNING + | ESDHC_FLAG_HAVE_CAP1, +}; + struct pltfm_imx_data { u32 scratchpad; struct pinctrl *pinctrl; @@ -188,6 +193,7 @@ static const struct of_device_id imx_esdhc_dt_ids[] = { { .compatible = "fsl,imx35-esdhc", .data = &esdhc_imx35_data, }, { .compatible = "fsl,imx51-esdhc", .data = &esdhc_imx51_data, }, { .compatible = "fsl,imx53-esdhc", .data = &esdhc_imx53_data, }, + { .compatible = "fsl,imx6sx-usdhc", .data = &usdhc_imx6sx_data, }, { .compatible = "fsl,imx6sl-usdhc", .data = &usdhc_imx6sl_data, }, { .compatible = "fsl,imx6q-usdhc", .data = &usdhc_imx6q_data, }, { /* sentinel */ }