From patchwork Tue Aug 11 11:38:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haibo Chen X-Patchwork-Id: 6991721 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 A01E09F344 for ; Tue, 11 Aug 2015 11:36:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 761C62065A for ; Tue, 11 Aug 2015 11:36:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A331720671 for ; Tue, 11 Aug 2015 11:36:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934002AbbHKLgW (ORCPT ); Tue, 11 Aug 2015 07:36:22 -0400 Received: from mail-bn1on0140.outbound.protection.outlook.com ([157.56.110.140]:61248 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933990AbbHKLgV (ORCPT ); Tue, 11 Aug 2015 07:36:21 -0400 Received: from BY1PR03MB1386.namprd03.prod.outlook.com (10.162.127.140) by BY1PR03MB1465.namprd03.prod.outlook.com (10.162.210.11) with Microsoft SMTP Server (TLS) id 15.1.225.19; Tue, 11 Aug 2015 11:36:17 +0000 Received: from BLUPR0301CA0006.namprd03.prod.outlook.com (10.162.113.144) by BY1PR03MB1386.namprd03.prod.outlook.com (10.162.127.140) with Microsoft SMTP Server (TLS) id 15.1.225.19; Tue, 11 Aug 2015 11:36:15 +0000 Received: from BN1BFFO11FD023.protection.gbl (2a01:111:f400:7c10::1:139) by BLUPR0301CA0006.outlook.office365.com (2a01:111:e400:5259::16) with Microsoft SMTP Server (TLS) id 15.1.225.19 via Frontend Transport; Tue, 11 Aug 2015 11:36:14 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; vger.kernel.org; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD023.mail.protection.outlook.com (10.58.144.86) with Microsoft SMTP Server (TLS) id 15.1.243.9 via Frontend Transport; Tue, 11 Aug 2015 11:36:14 +0000 Received: from b51421-server.ap.freescale.net (b51421-server.ap.freescale.net [10.193.102.57]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t7BBZxY3002344; Tue, 11 Aug 2015 04:36:08 -0700 From: Haibo Chen To: , , , , , , , , , CC: , , , , , , , Subject: [PATCH v6 1/6] mmc: sdhci-esdhc-imx: add imx7d support and support HS400 Date: Tue, 11 Aug 2015 19:38:26 +0800 Message-ID: <1439293111-21077-2-git-send-email-haibo.chen@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439293111-21077-1-git-send-email-haibo.chen@freescale.com> References: <1439293111-21077-1-git-send-email-haibo.chen@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD023; 1:ECVAtJcM3DiHtmpHtHoSsD4mnN4xNwvYRzqNOCg2hL8kGyqQwvndLfJE9JGiHeYwmYYXx/0YoYtMbgwL8qjENKE8XnNsGsVRKFWTAspvl84zp9nWx5PzZoC+JrXDbZVGXv/JHKggSEqfMqTzw4N5sqkD2g3x4ik9Bsog50jsK6iK3VoSMUnTMUvJg+W8pNVV0cpQxztGv2Zp2YjwBDIuDKp+6SKAJxYbtaUxNc+ByHRtClNmPllHPu61m9NsVfW52O8MocqAiMhfmkbD2xaN5Gy/pfbtIKTcdQ9nbnQ2dEDixvuPmLSGqa6PPS+OqRepzCdnzxlYiCP418Gf5UtK4Xuy2JmlgipCZ1cFVsLvC+P5PUr8bxlB2Tk5Ecg73cor X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(3050300001)(199003)(189002)(50466002)(76176999)(86362001)(5001770100001)(87936001)(5003940100001)(229853001)(68736005)(46102003)(230783001)(2201001)(85426001)(189998001)(92566002)(64706001)(5001920100001)(19580395003)(105606002)(5001960100002)(4001450100002)(36756003)(106466001)(81156007)(50226001)(2950100001)(62966003)(6806004)(5001830100001)(48376002)(50986999)(4001540100001)(47776003)(77096005)(33646002)(5001860100001)(19580405001)(104016003)(97736004)(77156002)(921003)(1121003); DIR:OUT; SFP:1102; SCL:1; SRVR:BY1PR03MB1386; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1386; 2:XV1CtDKg5AAyBo/ngIEKjYn9TfLQvQT5rE6f8ePDPJr1qy/uG3X3d3MnPNUWPSDtoZ3f7Ldcc9zgi4fyG/qro1yn6oby8cEgwbIwEuHT0wL1f1G+kg9eCwkCo6gulexsmiW9aCcB2mFGwT/0RNi6uJH7Liiy5Jiwg32HB6eHoAU=; 3:XRW/K97BKh8HTM/49+oLV108T24Q2eDIJ+uGAxW4MLKAsZYZsmaZUbolitOtHDN8CuYoLViyFqSrnHZWVcrmvSRWj1/p+A/dQ5kMtA60UelUPsPOu/TrvxEAqUUTbLWHQlX1Rv0Sx2fkLFkQ/bHRk6x0ZefyR9Ff/BnCVm++LVJ858wNB2+2DRgzQAhCvNmwT9kNSCyz7XuWswUjfXQSvEoX/XF+nDgl0BzaB+V0/2w=; 25:mQWAdMrqdmtxqOPBFQ4OSkYtaqxv6x5sj5iVjvXNrbIUVhax15t8TFKs4SE32v04RzAv/eTe9mj3GN1MYg6eikbbFYyv8EZDhRbfyartWrS7dUHJgEa5wjCvP8G8M2Pe90UpcbxHwL/AFASKpqN4EaS6wsPka5sGJagZJ3lJgQd+hS9Qr2Y2B6Fb31zscO+r0gfS486oAt9ISRbMFot/IUlzqHc6D19AfyaIsW4KkIoZQwRYAeysgqYojwIBxooPnI0NraO1exOdE3n5mBQnOg== X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY1PR03MB1386; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY1PR03MB1465; X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1386; 20:4LXQjlpyx15rTj6/eXFfMDGnPFDYhR/Enx3iFv20ilG9u33exvzOflG1AF1Jr6bSi/N83TVVZiUlxhWfwI0gKMf+CHKxhAtN8WK4acDRKgMsMZ/E+Z7YBY0huecpzGRZmc7kJ5am2dB9h6uQCbuPmuEQgnohEs3LnREHBEqNEg6Ji8gBHVru+R+zl9yEr+u3cd/fQLLY5Ij+xQk/NZyv1V0XNNTQCVC+rDp5m8CBpiClb+s2nXFyylOPKF2u/lLhUhfArr28vUNuyRXSzmrSA9AMLfxc2TY4YQ9Qo8KbP1s7rHn3JbhvU0YxNJbHdfvHfDPc0Fzzf2t20fWJ8ha7+HOoR7I3RhEBfmrYLYKnnyI=; 4:H/VKv622JJEFqTwf5hsjoH0fDfkd62/80vVsXAuSi+Ho4BVuir3VDGGI+VZibXVIvOFLIkrS696kr/wq1Ohhu2Avv15nFpJmT4s1C0ktG4mruetc5JKk5N5okVtmQFjFlRYCRMD8QMkQQp9vLmoeP5Hzd/yn5KUqzmRyrYwZSXA/a9wPB6ol2dxrGaGovWtIgtZ/eDYwom9BxGfaQaCcsp1waJfdLcRcvK2q0/W+P1S/u/DX63JmD/fs0Bza093KewZU+3eHr6j+O8dioBiOcteZRaAFJwZKf+fEy85o9sI= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BY1PR03MB1386; BCL:0; PCL:0; RULEID:; SRVR:BY1PR03MB1386; X-Forefront-PRVS: 066517B35B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR03MB1386; 23:qn6UpKcvlG26zb8V1NHxC8P/Iuq3WOMFarW6TMzUT?= =?us-ascii?Q?pwo+7uiGwncQ1BbdxoHfd1jQsjXEE1OFswvpbPV+w10egMDIyWldCRBFZ2vW?= =?us-ascii?Q?z2XPPHZy47sD9HP9GZ3fbBp9FxwbXdX5Lqz+EXSZgAzhYDPYURvpOgejpWyW?= =?us-ascii?Q?uu1k67wE/rRmOFZki8OeeaOL8OBA8aM2/pUqnqkQbSCr4iMihcqMNPNirsl4?= =?us-ascii?Q?5o4i6K3BLy+Dm1UZBEzBxCj06Zw+xKJsFIHNIA65THsFtiewrjdOhN3cjiOw?= =?us-ascii?Q?dM/ohaSHgWs6WeBu+HJVhKtensRlIgZdbcWNaIiZH1IF1GKE5+vRpMoZ6TTI?= =?us-ascii?Q?iq+adVCRB2DuV/YbHRIjmmb9regzrUl3Np03Jq4mfgZAy1x+C85yCrCt15KW?= =?us-ascii?Q?tnfi2gFJOj19v0LuZCIk/pUC19FCwa1vufUmbrRrMDKQMVUyjncLFD7/Pi+1?= =?us-ascii?Q?V1CFZqHH0w9JJ6jeDz9Vfch5d6bdpQEb58EfN9b9mFew0nWKUhKK4yS7rrS0?= =?us-ascii?Q?zEGojQ/VMWT4zV43Tqml9DAvzZTZ+dD8/wzu2djiL2v2ihCLLHj0yyB0LI0T?= =?us-ascii?Q?9F/aZibqAi/BFJw6UfA+35POg+p1aMcnO5JxxpCwBQ9864alhLzL6YowtLnu?= =?us-ascii?Q?H7bdEpeKFW12PmBfkqZCq+dtg2OKVG6FI6f7r/ZF5QcjG624UaFBd22A6XZb?= =?us-ascii?Q?CEQnp+rMTZ+UU7A5YNohuadJ6vvdY0EorVDlXzPFpRrwXizk9Q3W1LpMXwvl?= =?us-ascii?Q?eXyyjA/lnA4nqCDvOnr8hNiyzN8rtUS0ZIhjMvxUzf/gA52WjNi4C7MRA9H6?= =?us-ascii?Q?5CmJGc3Frd5UoFSoMbk1CWWNuHX5FY414yyMITIUmDyGqELEj9zHhzPPspLG?= =?us-ascii?Q?hiMPahRX0TogNfueEGsert0FkwBa1ldsmLv4by8mDHeQ2DGrkYyu7z3z77/o?= =?us-ascii?Q?/HUy/Av6bR4CkU3wUA6Z1s0xt9r1WSunSPlXgo6O0SEc/hOPkkHNq4HUKCqG?= =?us-ascii?Q?qetqUq20k3Hjhn7ggQ1grnRK+SohAIKmCQHcMwH+hgfsr3UwLEkH36QEDBHS?= =?us-ascii?Q?vpCLuQZU3I92ZxF7cbGhPlbHy5WRrXbfcISj1jKalw9XtYF2LM2qYind/JAE?= =?us-ascii?Q?EuX1/3E51T/ihduvfPclW106Qn3sGPxyQQNhLXw+QRbvUOAyApLz1VSRfiq5?= =?us-ascii?Q?kN83PTnSgu5GklshqS7VQeljgdgnQkbwl1akz2u1NCLasgqrpM0n8rmWEmCv?= =?us-ascii?Q?o/T6WQqCT5mz9DwWNw=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1386; 5:il8XsV3KYpI6qD4FrCyC2sRlLSMMpVfKM1xfORJV7PaeAIPTGDSvTWz158CFQa2Nm4cJauYHmgpeEYmdKCzSaEazKdRS3DMwhr4iKfW7lctC/BonHB/LluwB8Ma+n0xzrLJ97lWPOpLYYnxrYugeNQ==; 24:+Kqz8kjvno3E1jhT8fTYRMEJEkTdyPp6lJ3IOcQijlRCln8qKdbqdGGoXv1GP2BrTwCOTAt+DpUWRrYRcjAc1PAgKt7anm4xmgbvf3qMnpw=; 20:tIJv0aMw8t9fB/a33luchrMdTIrrxKUyGLqyp862Rnt7BRT/fLXYUQWoiOB4m7gnAVtifsLFDHIoEfmFUP8wGQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2015 11:36:14.1610 (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.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1386 X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1465; 2:362k0V+w1kh8Tc6otVulAsPhF1RiatPiYm3+yf8zRyBEi1kp2GE7P3weKF8rr0S+NMe+p8D8EPEjpOwgGYsZ1A3q16ICfwxQfxnPoURXa/Pby4Nh9eBJoA94fJON39HiSwvPmT4ktkhDnY2NncraA2VeyzsJHfylMGQVzegLGFY=; 3:aQ7KKydM1jIsDWevnCBoRv7uchx9MyBZAEzlxVhe4gcV+FaIHZ4ZJZdwdFjl97vEiZuhjIo/heUs5LHydjvQE5yqWkUX6yAE4QKNvAy/q8vH+DeXjaq0ptXETHwTmsQqZ7pF+/45kT0othpHaZq7FUuKX/SBK+U07M/bcpwi1cMkjiQAL6MRVWvIwbcUs+uhXyvyTWStrd1zTe1V+jfWIbZVTTEzKMRlNOrkiWQ8JhI=; 25:KuiGPCwBzIBpl1QvZ+Wb+hr2UdUlHXDlguAk6UvFm2+jSTtPlhSj1A9H164t30e83yEVKSlVQRR/HRwq3x1PwH4th3Agu8M4+nENv+t2itIyioF36dr3gQvt/GikoH3fUsqIKmAeCdVU3wPfBrS3vg6pp7mU5i6v6nxoE1UMb0E/9qolL8r3a+I5x+UvP75xWBnhulztQIa0qFdXwYhGaS9dyHhXWpToeeJXzZIuE2XnTJ5/TvNzZnPqD37Y+bV6G+WlJodYCWPtB35FWDWS4g==; 23:JR2ogY9pNhneCRaQ9yxobFn6SMRDWbDoOB4gYLiyIlR3CT09uHIJUAQ1uIEsRImcwgmlBOuz99bjaLK3LT9yONITu9usOAU5DKqdoaBktI/l1EERTYfD0ov7U9V55qLhctdVpomTyKK9KKd1VZ7/wAZbbl9vxmRwjYrJqktB61zuU9bDmKds6TBA8RbWOLv1TRuhF7dsx9+ivLXH275BzennRYj1ja8u2zSwjp2PsNrbkd7 d2zzTDAAZt5Sj7pb7 X-OriginatorOrg: freescale.com 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.1 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 The imx7d usdhc is derived from imx6sx, the difference is that imx7d support HS400. So introduce a new compatible string for imx7d and add HS400 support for imx7d usdhc. Signed-off-by: Haibo Chen --- drivers/mmc/host/sdhci-esdhc-imx.c | 86 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index c6b9f64..b8b7e88 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -44,6 +44,7 @@ #define ESDHC_MIX_CTRL_EXE_TUNE (1 << 22) #define ESDHC_MIX_CTRL_SMPCLK_SEL (1 << 23) #define ESDHC_MIX_CTRL_FBCLK_SEL (1 << 25) +#define ESDHC_MIX_CTRL_HS400_EN (1 << 26) /* Bits 3 and 6 are not SDHCI standard definitions */ #define ESDHC_MIX_CTRL_SDHCI_MASK 0xb7 /* Tuning bits */ @@ -60,6 +61,16 @@ #define ESDHC_TUNE_CTRL_MIN 0 #define ESDHC_TUNE_CTRL_MAX ((1 << 7) - 1) +/* strobe dll register */ +#define ESDHC_STROBE_DLL_CTRL 0x70 +#define ESDHC_STROBE_DLL_CTRL_ENABLE (1 << 0) +#define ESDHC_STROBE_DLL_CTRL_RESET (1 << 1) +#define ESDHC_STROBE_DLL_CTRL_SLV_DLY_TARGET_SHIFT 3 + +#define ESDHC_STROBE_DLL_STATUS 0x74 +#define ESDHC_STROBE_DLL_STS_REF_LOCK (1 << 1) +#define ESDHC_STROBE_DLL_STS_SLV_LOCK 0x1 + #define ESDHC_TUNING_CTRL 0xcc #define ESDHC_STD_TUNING_EN (1 << 24) /* NOTE: the minimum valid tuning start tap for mx6sl is 1 */ @@ -120,6 +131,11 @@ #define ESDHC_FLAG_ERR004536 BIT(7) /* The IP supports HS200 mode */ #define ESDHC_FLAG_HS200 BIT(8) +/* The IP supports HS400 mode */ +#define ESDHC_FLAG_HS400 BIT(9) + +/* A higher clock ferquency than this rate requires strobell dll control */ +#define ESDHC_STROBE_DLL_CLK_FREQ 100000000 struct esdhc_soc_data { u32 flags; @@ -156,6 +172,12 @@ static struct esdhc_soc_data usdhc_imx6sx_data = { | ESDHC_FLAG_HAVE_CAP1 | ESDHC_FLAG_HS200, }; +static struct esdhc_soc_data usdhc_imx7d_data = { + .flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_STD_TUNING + | ESDHC_FLAG_HAVE_CAP1 | ESDHC_FLAG_HS200 + | ESDHC_FLAG_HS400, +}; + struct pltfm_imx_data { u32 scratchpad; struct pinctrl *pinctrl; @@ -199,6 +221,7 @@ static const struct of_device_id imx_esdhc_dt_ids[] = { { .compatible = "fsl,imx6sx-usdhc", .data = &usdhc_imx6sx_data, }, { .compatible = "fsl,imx6sl-usdhc", .data = &usdhc_imx6sl_data, }, { .compatible = "fsl,imx6q-usdhc", .data = &usdhc_imx6q_data, }, + { .compatible = "fsl,imx7d-usdhc", .data = &usdhc_imx7d_data, }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, imx_esdhc_dt_ids); @@ -274,6 +297,9 @@ static u32 esdhc_readl_le(struct sdhci_host *host, int reg) val = SDHCI_SUPPORT_DDR50 | SDHCI_SUPPORT_SDR104 | SDHCI_SUPPORT_SDR50 | SDHCI_USE_SDR50_TUNING; + + if (imx_data->socdata->flags & ESDHC_FLAG_HS400) + val |= SDHCI_SUPPORT_HS400; } } @@ -774,6 +800,7 @@ static int esdhc_change_pinstate(struct sdhci_host *host, break; case MMC_TIMING_UHS_SDR104: case MMC_TIMING_MMC_HS200: + case MMC_TIMING_MMC_HS400: pinctrl = imx_data->pins_200mhz; break; default: @@ -784,24 +811,68 @@ static int esdhc_change_pinstate(struct sdhci_host *host, return pinctrl_select_state(imx_data->pinctrl, pinctrl); } +/* + * For HS400 eMMC, there is a data_strobe line, this signal is generated + * by the device and used for data output and CRC status response output + * in HS400 mode. The frequency of this signal follows the frequency of + * CLK generated by host. Host receive the data which is aligned to the + * edge of data_strobe line. Due to the time delay between CLK line and + * data_strobe line, if the delay time is larger than one clock cycle, + * then CLK and data_strobe line will misaligned, read error shows up. + * So when the CLK is higher than 100MHz, each clock cycle is short enough, + * host should config the delay target. + */ +static void esdhc_set_strobe_dll(struct sdhci_host *host) +{ + u32 v; + + if (host->mmc->actual_clock > ESDHC_STROBE_DLL_CLK_FREQ) { + /* force a reset on strobe dll */ + writel(ESDHC_STROBE_DLL_CTRL_RESET, + host->ioaddr + ESDHC_STROBE_DLL_CTRL); + /* + * enable strobe dll ctrl and adjust the delay target + * for the uSDHC loopback read clock + */ + v = ESDHC_STROBE_DLL_CTRL_ENABLE | + (7 << ESDHC_STROBE_DLL_CTRL_SLV_DLY_TARGET_SHIFT); + writel(v, host->ioaddr + ESDHC_STROBE_DLL_CTRL); + /* wait 1us to make sure strobe dll status register stable */ + udelay(1); + v = readl(host->ioaddr + ESDHC_STROBE_DLL_STATUS); + if (!(v & ESDHC_STROBE_DLL_STS_REF_LOCK)) + dev_warn(mmc_dev(host->mmc), + "warning! HS400 strobe DLL status REF not lock!\n"); + if (!(v & ESDHC_STROBE_DLL_STS_SLV_LOCK)) + dev_warn(mmc_dev(host->mmc), + "warning! HS400 strobe DLL status SLV not lock!\n"); + } +} + static void esdhc_set_uhs_signaling(struct sdhci_host *host, unsigned timing) { + u32 m; struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct pltfm_imx_data *imx_data = pltfm_host->priv; struct esdhc_platform_data *boarddata = &imx_data->boarddata; + /* disable ddr mode and disable HS400 mode */ + m = readl(host->ioaddr + ESDHC_MIX_CTRL); + m &= ~(ESDHC_MIX_CTRL_DDREN | ESDHC_MIX_CTRL_HS400_EN); + imx_data->is_ddr = 0; + switch (timing) { case MMC_TIMING_UHS_SDR12: case MMC_TIMING_UHS_SDR25: case MMC_TIMING_UHS_SDR50: case MMC_TIMING_UHS_SDR104: case MMC_TIMING_MMC_HS200: + writel(m, host->ioaddr + ESDHC_MIX_CTRL); break; case MMC_TIMING_UHS_DDR50: case MMC_TIMING_MMC_DDR52: - writel(readl(host->ioaddr + ESDHC_MIX_CTRL) | - ESDHC_MIX_CTRL_DDREN, - host->ioaddr + ESDHC_MIX_CTRL); + m |= ESDHC_MIX_CTRL_DDREN; + writel(m, host->ioaddr + ESDHC_MIX_CTRL); imx_data->is_ddr = 1; if (boarddata->delay_line) { u32 v; @@ -813,6 +884,12 @@ static void esdhc_set_uhs_signaling(struct sdhci_host *host, unsigned timing) writel(v, host->ioaddr + ESDHC_DLL_CTRL); } break; + case MMC_TIMING_MMC_HS400: + m |= ESDHC_MIX_CTRL_DDREN | ESDHC_MIX_CTRL_HS400_EN; + writel(m, host->ioaddr + ESDHC_MIX_CTRL); + imx_data->is_ddr = 1; + esdhc_set_strobe_dll(host); + break; } esdhc_change_pinstate(host, timing); @@ -1100,6 +1177,9 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) if (imx_data->socdata->flags & ESDHC_FLAG_ERR004536) host->quirks |= SDHCI_QUIRK_BROKEN_ADMA; + if (imx_data->socdata->flags & ESDHC_FLAG_HS400) + host->quirks2 |= SDHCI_QUIRK2_CAPS_BIT63_FOR_HS400; + if (of_id) err = sdhci_esdhc_imx_probe_dt(pdev, host, imx_data); else