From patchwork Sun Jan 21 11:00:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 864028 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="XM045tDc"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zPWnJ1PJpz9t3C for ; Sun, 21 Jan 2018 22:00:34 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 575B6C21FF1; Sun, 21 Jan 2018 11:00:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3529FC21C29; Sun, 21 Jan 2018 11:00:28 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4E19CC21DA1; Sun, 21 Jan 2018 11:00:26 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0050.outbound.protection.outlook.com [104.47.0.50]) by lists.denx.de (Postfix) with ESMTPS id 42D87C21C29 for ; Sun, 21 Jan 2018 11:00:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=5+pKdvhv6tfiNLciynyfDVvVvUO0VuJwN9oBgMx1xCE=; b=XM045tDcKjufG4NcxW0Wyb8Y7LCFyqJUzgyrkfTtElFkS1N28dhbx5DFiYspXVOqZmb1iaN+gfLg2klciEkTchqQwGwNtLGZKLZzhOuw1Et1UD5C0lCKX98PJmufgMKm/tGA2px1ssKM1Xe1EL2ECk7KG/w4K4+2SUDsJiZubhY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from linux-u7w5.ap.freescale.net.net (92.121.68.129) by DB6PR04MB3221.eurprd04.prod.outlook.com (2603:10a6:6:6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Sun, 21 Jan 2018 11:00:19 +0000 From: Peng Fan To: sbabic@denx.de Date: Sun, 21 Jan 2018 19:00:22 +0800 Message-Id: <20180121110025.9645-1-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2PR0302CA0005.apcprd03.prod.outlook.com (2603:1096:202::15) To DB6PR04MB3221.eurprd04.prod.outlook.com (2603:10a6:6:6::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4f697f94-48bd-4eeb-f748-08d560be2b0c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DB6PR04MB3221; X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 3:WNwcUsbm6zXT2W/vjDJ6gnCmOUG7lY+y6cXuW6znIUwsOGfyTkrnMO0qYfEIA0p0Qh2s1G+pwXlGmAi865LWl7bBCpyyqAKp1x/43P1jVjTuhW5g9WqpheVXwExW7gEEjgCZ579tyTqdx9PV3xlJ3CDSh6T7nC52f1ax0kxbNO1CDrs1l1NzAnDaZ2uutYimMYm93nRnXpagdksXW+sgOjX9BAKaC3o0+4h7UuG5VedOmDdjC8lw/K8YljqQ0z+b; 25:jJz9mP9pYYbb3t5LDXNOGRIuX/7hh8UzPnYhY/A4S74fAyUIKQtGgBcHwmrVvI9hbJ27WvKE5dhFghwubm6QewA6Y81K8LQ9b9UGLqm/zO0pEwSxsGJY39bVhUDmYmiqFs7vEa7n7ICoNshGp7wyPmxHLKHRKSP2n8iVhhBaV9wQZsZAzbFTMfaPVUi8GekOq79XW4dtf0PIa0J8iv15BFymCEq86LgN8ZMUoTPVKwkwhWDgCruF8yhu1eIkLzbbn6n10CSnKkgUiNzdGnq5/Lyb3bGZXL6dmU8KX6iMZPfYo0FKPm0IkQGdm4LwjBYD1OV8AZsPFNaEAt1Zi4TS6Q==; 31:wfQELHg2YkEHRR0AX5uFtd6ZtMlxm3ZNJuVBq9tlA0hQ8ZNpggKP7f38tUH/m97iX9jDHPUJy77DXZ4A3DCvpV5w6wWd+O/e8xbTBuWP0ekH7er1jwy5sBajbXoZ0PWXGzPecfYmjq4yY4oW1eZi+VJsgeM7ho9EwzEkK0ESU6qiwzrNFi58AOCWXhw9f+7eT8Xj0TfRxEKqjL8aMeSiF52yhor5n4H8XeXhrYNzZC0= X-MS-TrafficTypeDiagnostic: DB6PR04MB3221: X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 20:DtEPOEZ0/jxnAlcbLy/22Ob+Vov5Kwv2R8xd6iYWoj8gmF/3+JCRrGA9OwFPTriN32+HRM22jd/owawmTtt8rlvduyfp49FLE5fkv7jJP7sWLgoUu6NRyEqsGfr/fvduktXcxlLoH5/ujRowwJuOqQHLel30ISqs8SL6h82MMBY/lMQJ2KmYmsQxwix/1B/ZuRbtK6SCxuiwOSpVms0ImzOEygqMWQepIezryhGEeSkPnRXiomrsXBHDAV49ufJ0BUWs+T4oXgqrkK55Z2VDKaixBTx4G7g+TR/KlwTE1hs9tbN7QMcLeL+vV2sQ0KOBavwLAEfPg02DnmjwBV26C9nOoKSLscMYZZYbI/zNopXwofwpl6n0SG5ZGkUuWVdFsQHreXhQ1404A5E+4G1sb+yEHmvSvql46GTyjQtHgY+vJjuHYFpmKMxW00/f+IxRS2KwoMC3e7x6WYQNchU4Kp0S787kcbtQ1KZQpeyhEG0wH7kjEuz0hx0bd5K2nhbg; 4:zj8tGZl8JtNTq3KAAMFQ586Yyl8cug47yR7Q2wNwqImg586Cn91LqG/MydeG70pC/Oj3E3j4umLJDVSIKfEfPnuhLT/Fk2Q4Yhot4a1qZMoEgxF0abF3nYTO10LF31SBSgPs/6RFl+ND5+JTVgLiJD5g+2hkwsNafDBHr7xQYWxwd2fXCKP/JjSrKL5TYyxtV06+MallDW085nF7RSnjSuSChiqW1/OPuG5y4x2c8HxtymBFu3Yrj1jkzXKkLETSQPoLqP3cNy5OQBSEJko5LZnkoi21mQOlrrgNgOSKEptf7rNoIAIi3rcZ1Adal33mGOJaPOHTT91ObYL+yi8CLmY3zustUplza/t56OpERGA= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(7411616537696); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(3231023)(2400081)(944501161)(10201501046)(93006095)(93001095)(3002001)(6055026)(6041288)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:DB6PR04MB3221; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DB6PR04MB3221; X-Forefront-PRVS: 0559FB9674 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(346002)(376002)(366004)(39860400002)(39380400002)(189003)(199004)(47776003)(52116002)(48376002)(6512007)(53936002)(97736004)(105586002)(59450400001)(386003)(6506007)(51416003)(81166006)(7736002)(6916009)(8936002)(8676002)(6666003)(81156014)(50226002)(16586007)(106356001)(2361001)(2351001)(305945005)(68736007)(66066001)(316002)(25786009)(478600001)(2906002)(36756003)(26005)(54906003)(6486002)(5660300001)(1076002)(3846002)(6116002)(16526018)(86362001)(4326008)(39060400002)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR04MB3221; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR04MB3221; 23:rn1RuUf9j6RcXVzInEmmrXURua5WXm1xGPjTG8A0X?= uLkN/ehiu4v4k/6PSSZPX/q/H8UsuDXU0HFEVU0J4dnMcCMaKAzTCW04IzP/Ugc7R5hgmaRwIPJ70PtbAoEG/RSaOetqKiaSE0CF2yVrYBhhCCP2h/C6ZPHloNSZcZjIQVBDTwiYPHB9tKPheTcAEU/bpv0VZ58MWf/MoEDWH/pnmnuZ4+GH9YjbuDbxgxAt8EzO+93YRL3MA/lyqfFp3ohDHzXbOyDc3sYnd/T1xWLmMkCwAFSXJrLZYBgRG5tYWiLqpfFtRN6FdMut/oNbwf2BniazlliDLLyPg6TKKQS8KY/nTR6uNj99RmFAk2vcK+h1bVQRaXSKeiSGz9u3wuWHkCPe4fjYP2r+0hTrNbP83spAmEKVhq1pFql0NcUydYG8M+G2yyFeSElzPPhUlW0e/SLi9n3qXt0/145xYadVxYeHACf3DZV+jAxxudycsBpvYsGOIDth+ZIhayEOpMJ6+JDwGGD5Tb2LMOhBJHst+jGsuPZQYTo0XTZa+0z4mAaWgK2Sl9X9rjMfabfEjZ8GcWN4dL6JWwHYFwPeu83xLLR7yrK9YfYwBmgdMvmi6sLOHbVJlVPxJE0Li/absAGB+UH9q/YNMcHKuKqiB2MC3A6rfWuJLTVMIACpD4gfSiBAoSO4U0JG0JBk1/5iQ7JYaUDbbQ47ojIIau5w0IYXPkxdMBAgXRO26AOkWWiU7i6qTQ8IMEpS8uz5fxzrEbrRxCW4ytA5MUdY0NUiuOg2wuMY8oINtJzJ5Cn1Fl8yRzXlw94h3S0LCcoh0Glhwe0jkO57T+iBZlO03FI5PF10BZxkvuPvxWmGalfPnrg2D9WR2WdL2wvgGyYjmLyi08YQa5VMLkWUmnYp0sXeezafxKA/XVi0w0rGNWPK2+k6qvexjGnTAxhu0cJ7em04Y8Wo5BpbhHBZZpvGTIRzgEz6UrEyyiSjqwCyOwHsF8fQa94q2Hhnv5lwz7WFcjL0bJGhk7V7vr06hG0z6hHvfHgEGNfm29rZMvmnNIlErpl6hVF/pE1D0KcvD2I97U+ShL4ztV5L5NsZVOdN6DZyoP4RXAoRKHNGASeZye+CGJbM0IbiuQz2dkMuIPPx4BHeyhyUwiN9ZxEp1kZCNpQlRahkQ== X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 6:k0OODYpM4B7sCPmiusqBe527tDtVJMrsq7kljkJvL08sOkMwFc49zsayrbOyFfeaamj2ySkteOPS1ov+BZoE7oCMpS283AYlXLlOtmq/W+OVfa0HlW6KsBdCFj34dP3OJNbhu2HYeZ/T5hnmS3VVFeoDa14Bekrd5QontKm74t67XHOxZWLkmHpF45f6IrPbC1foslrZ9X4HqsvFg0pQb24okKbQHSn7m1Foa9oA6EpuEz/veGhhYsmIvAoo0KgKGN1BjJNG8TBhjkGWGfRG0hnqW7HgwYGyqaHrJNoswh+BChyABE7WDMvlwFBScqHotrJj7EqdXxGQCJTjs0cb+cI1zox16q4WSwtBnh3xMV0=; 5:xx9c1eJ5cJ9nHXOaKCTcyQuRtvLikMR6PMXTJlBGD/ZpojhuqmX9aJrEM9R9v9zNykoiXmjNMCkuh+4yXChH5UCR5cm4lBXrJV+9GKjel63fpaOiuAEHzLLWbd0VfRqI7qWEnksBUIg+anE6OLfjrI3S3E7as4u6kWqblKg7OcE=; 24:0BgLwCVk/ID0Ln0myTuTh7wRwGQGP1dF47VcKssRweS1dMlotxayuhf3wgDra+9Qdl0qS9aAUXbkgb82ZhbmjUV3ar2nawJ/UrDtKUiAoD0=; 7:x7FbojpRTqUV0lqEJoDUW0DIkW1aLGw9tYYUlAmQY1dN+iwbLgThvpUlM2jQ62go7laoSIXMigYb/aUARJvFl5J1/kMcI7hAvvG4IkhacknMBLfxEW6wS3hI8DhI7Ie5Bg/8gRQxUx0uc2vX+4E4boshX5Jxwz2ps+nV0JoVYqH8MDe6AgdCmepyi04gC2A6rro0AhGEoyZ1oYNlixYmpJZqoE6+uZDug6k9TOEcat6zwvW4abJEFJNGpFLUKzP1 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2018 11:00:19.9803 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4f697f94-48bd-4eeb-f748-08d560be2b0c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3221 Cc: u-boot@lists.denx.de, Fabio Estevam Subject: [U-Boot] [PATCH V2 1/4] mmc: fsl_esdhc: add strobe and tuning entry X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add entries that will be used for tuning control. The whole layout not changed, just expand reserved3[84] and rename other reservedx in sequence. Signed-off-by: Peng Fan Cc: Stefano Babic Cc: Fabio Estevam Cc: Jaehoon Chung Reviewed-by: Jaehoon Chung --- drivers/mmc/fsl_esdhc.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 71c62f4233..f6279307d8 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -61,23 +61,27 @@ struct fsl_esdhc { uint dllctrl; uint dllstat; uint clktunectrlstatus; - char reserved3[84]; + char reserved3[4]; + uint strobe_dllctrl; + uint strobe_dllstat; + char reserved4[72]; uint vendorspec; uint mmcboot; uint vendorspec2; - char reserved4[48]; + uint tuning_ctrl; /* on i.MX6/7/8 */ + char reserved5[44]; uint hostver; /* Host controller version register */ - char reserved5[4]; /* reserved */ - uint dmaerraddr; /* DMA error address register */ char reserved6[4]; /* reserved */ - uint dmaerrattr; /* DMA error attribute register */ + uint dmaerraddr; /* DMA error address register */ char reserved7[4]; /* reserved */ + uint dmaerrattr; /* DMA error attribute register */ + char reserved8[4]; /* reserved */ uint hostcapblt2; /* Host controller capabilities register 2 */ - char reserved8[8]; /* reserved */ + char reserved9[8]; /* reserved */ uint tcr; /* Tuning control register */ - char reserved9[28]; /* reserved */ + char reserved10[28]; /* reserved */ uint sddirctl; /* SD direction control register */ - char reserved10[712];/* reserved */ + char reserved11[712];/* reserved */ uint scr; /* eSDHC control register */ }; From patchwork Sun Jan 21 11:00:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 864029 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="jxnHbshE"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zPWp04Hhfz9t3J for ; Sun, 21 Jan 2018 22:01:12 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 47145C2204B; Sun, 21 Jan 2018 11:00:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 0B328C2203B; Sun, 21 Jan 2018 11:00:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 33620C21E2F; Sun, 21 Jan 2018 11:00:28 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr60053.outbound.protection.outlook.com [40.107.6.53]) by lists.denx.de (Postfix) with ESMTPS id 2041EC21C29 for ; Sun, 21 Jan 2018 11:00:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=c/y5otxArmcOwWOSeNlwcOb/EgaKtoUJLfw+0Arpuuw=; b=jxnHbshE+GqLIRi24QF+s9Mbk1pCtafhbormZd8cBrfhnaZxGO8xNep6CoNPrScurXFjIBVU2tDV4RrpB2piEXPufGJaDY2YxZYSVrGOytOGYkG2nm/Bsq4NyN6VETnAAKKwHoq3ymgoYBeIlZOXCEEAVsiIUSzE8fI+RfK+uBA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from linux-u7w5.ap.freescale.net.net (92.121.68.129) by DB6PR04MB3221.eurprd04.prod.outlook.com (2603:10a6:6:6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Sun, 21 Jan 2018 11:00:23 +0000 From: Peng Fan To: sbabic@denx.de Date: Sun, 21 Jan 2018 19:00:23 +0800 Message-Id: <20180121110025.9645-2-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180121110025.9645-1-peng.fan@nxp.com> References: <20180121110025.9645-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2PR0302CA0005.apcprd03.prod.outlook.com (2603:1096:202::15) To DB6PR04MB3221.eurprd04.prod.outlook.com (2603:10a6:6:6::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 155c7ac8-ca80-4cde-2ffe-08d560be2cec X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DB6PR04MB3221; X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 3:/SWtC5Mxzr9AmEyz/s6V6K2rBtmcUysuyozWO4Ahz+3Ydj7fJlrmT0bc2QbVGE0lJW1mOfTKyMYNlegEN8NT3GiIHsY8anTshYWemfDsJvpmELVwFwwQjeVfxzgzKwq8NO2BkOtLtWwQC9wTxoRT3W1xFr8s9p9atu6oxpnPaSeIn5XsazUmC1jAeMQ8dHvdiHfau56BDbh1m9f4KPqPu92n+gNyMoJay+aZkeMzEK3tzCpzvau2yfzKcdIJyRjy; 25:u5OhRlllsLPAPXDzdnHbs90b/6c+u1lIJXqcuDnD7CVmAcpST0tKOOf2i0Ib6NzUhptc5Yl31KQtdyhMHNDL7BpuDLbsW0bFh1lVU0R4FVq5Qagh9HbeBLYlCaGAsIJrgM5uH8AoeFdiW2vFCbes7VMAdh4OUQBynYyYAZeTyygIizNj3Y2Bl4H90elIvyrcgW/Wxst7SpNzjnXOAcQGvQuhro9SPz4rKU3bddnBaggbevlNRD3E+YlDlHEA3/KVJvwlr0dzM7ZcI+YPpFLxK9BgSR11wgEJjxrK9oE9mK0EpgZkv1f5lNldJh5B6f7x1prfhKSWzs0eLqytlmfGRg==; 31:0zfoU4AHuIlxfjwMsKYR5v/OTj8ZFWcbmEPw3mIEEolU4w93o0ZHh5bTAmhh+gw3AAUYw68GIhLsWdNYGdpguVP63x3vund+/skueIZgbYnz79YEGak2tN/V45vPB7g7Ju5gLWju2meQBY/GyoVPNgnMelFjvU9SuWlp16i6sLait0u6D+4GMWKoizMhS+NEJokzFyoqe7btC4Qb8Dv5YEzIuqj28GxFyLGY7HF7ZV8= X-MS-TrafficTypeDiagnostic: DB6PR04MB3221: X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 20:i6oFllueOirlQaLEgeyPWwq5Mv0ZPxi3BBED7CxVFyfOOAhQs1e2gDK06OfAQxTZHpfXF5QuFHhpfgHAmDIg2dgphPAKjaTcZMrtSlGT5MBCjmKOelee7PEEAa8/pcuM/vf4gIdAfi1eQ07bg9V16cyuQ5exjTmUQf99jSpgKHcDINbUy9gW/LWUdHmKK5vF2EpVvvk4wzvzjUSlRDyz6djU2jSec8ElSZ+DjYCqkfFl3vC2eb9jSDtloYiKunrIfyhcRl4oB/1RsolVpY959Zqc9Lj8/Ra2nvKCaeyiTNmO+UNyM9eSbtjVXPRjIBn1gZxA/58ZRsahZ0cKy4sGgZXJWxbL+/4+MmmVvcuBig1zMYGJ37FZHzBxcD9o1IVaJguN3I3GpRDIigtBj3via+Joq+pRZTij5d5/dbo7AagkKKHF9uAq+4erIgyfg1RHQb7XqbT+f6UM3oyL0tXTyWUH9O8VAvfT/K3+xdE45ir3Hs6ZfizbDiIRm+4fQVTl; 4:7tydw26IT2z8HnNu+TNmN+/KeYkA8G91OOmnKKzWCR5EFEs1DnQgixdqtLbvsBnXtTU2NCRmnnUPDUr7+0x5PXJ/3hywYgus/GFa72YW9ioHoRUvnVNPa2aAC7kXtKbthJoKTJEIxFqV0EqfH64n/AS61G2W8eLOkSCFR/MhpFSHv9WMdElTZVPSXpyKbiw6TyrUxEuudcSm61Ts1JtzgRgd7jRhmvqxbDIM5ha/tNaNp40yBfoLqi1lXNlArybJBmGYgVmBIrk/k+BXlOFL5ifF+3PTvV27qxmc6Dp6ooQSVOm569hYAudE6dSCqy8YJ+uaqYmgjU1lL/VKkwJqn/gXkyseUWFyuLcGBo9lwC0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(7411616537696); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(3231023)(2400081)(944501161)(10201501046)(93006095)(93001095)(3002001)(6055026)(6041288)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:DB6PR04MB3221; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DB6PR04MB3221; X-Forefront-PRVS: 0559FB9674 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(346002)(376002)(366004)(39860400002)(39380400002)(189003)(199004)(47776003)(52116002)(48376002)(6512007)(53936002)(76176011)(97736004)(105586002)(59450400001)(386003)(6506007)(51416003)(6306002)(81166006)(7736002)(6916009)(8936002)(8676002)(2950100002)(81156014)(50226002)(16586007)(106356001)(2361001)(2351001)(305945005)(68736007)(66066001)(316002)(25786009)(478600001)(2906002)(36756003)(26005)(54906003)(6486002)(5660300001)(1076002)(3846002)(6116002)(16526018)(86362001)(4326008)(39060400002)(50466002)(966005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR04MB3221; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR04MB3221; 23:JWFbEMVqVfziNUcvwQmsy5Xr44q+FvAfsy+pVgXeY?= bn40/Dwp2jXxONU9iZPlaxfB6APQJzEkWB78rZMAdH1IAZYLYWWkUVRhJnrKLCBQEyEo+b/Mj4RFtd4hvJMZfIrgCs2XbQUfHdOcz1OKs1qcWmB9h+7VJuEqZDAekXr7DbhYZiRarjp4IGl3pvqJSlIOlKFZfJQDyn6eBSrHpeU7Vj5yOckpDqEv2Qpe9eTBgB2l2z/iktjHs+6mNtgMShWcEEUmKVSCEsj/W4QCNXvfXLPiFD0GJp4+ZiaZnPapgyvJHkdGu2Kqj+jdpyiymxtO6r3vVe6CE2tyI8Gvzuhc0uTO9JUvl4R9PPkSfI/3E0MhEztezzdxJAYBtSpKYnH2pFq6pEMDF6C/u1JSZM6T2YvA8dl5/D5SbdSrAaguVyhwV35gbEueQh9D3Cd63NT0zwZw6Hpxars8Dj1jqUtJAOUvYobhPSVcmgioumpQBrqb5TW4UchXXcmpbIxdgGhxd0fT4lD9JAm5afSdkFYGWaK+xZdQf0ZUVke9wgLiBWR4W6DSmPb/UPeIs5HOl7Q/YnumBWsjcKLwTuuaLt+ZxFVAnfRuQFuLeX5qS2LTm59sLbzH4AwueJ7A0J9ptM0ezxotMZz9Oyun/Y/cXxQAFqovdfNkzGlUZ8V8G9kfvTx2epo3GsNz5RWU8s8lEb7xQWifw3vapqrWzW4D0wK4YWwCMKUFucHPBPirTVJgdZGRWT4x9igfH5Avynn7q3HtUfzSnBfva1O7m+6A5Au5gMJvtT8mOUX6o/si6q2ZxY1XdYXAzxhZ/5J4sMu4HKe8+tBf5MinRInXO1Dzn4bWs+ZN2UaYGdnX46NxE7/BjrrXyln1iI18PgGtN47YQaQCc/bar1jtyCyKTWoGZt9F8ljhE8DHFwc1mqxcC81NgMNZ8tvodhKCp6wnFzNYvltl9UwNA/7EPnjuFbtjI2tOqOE6TLKFaXDtHh78gaymDTquJ3mky8tUqJgvkvywDaeguK8py0RdC0wY7uhK6beUaL2i4hf/me05pVWj3wWC7UeXbcMTm+wmZ/u2sd5N4i3KlvueQefzI4aRGvygLWiwaxvLv5n8Z7RWNiyZVszwZf7X9hQQSHZPrQyBk8QpuTdSeAqeyR3481HHCFKBQo8rqqAUeowJN8yxqVMUneWUxc7T6qfXrEKUu2/Ggv3ZUyicCkecvnQFJXWZgiWDY0MJQ== X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 6:H0cbhTxHKZVFxJUZzHiXA+fNglqrFTeWQR2TXbQgQGdYqRZaICNIjUQRWNMysrVnIUJd83jmbZUneby07jGS29KcefI/hj7QYHgvqoRn2CYR3lQJlCuE/HSsSHmad0tGS6MZk5L4XubGMq2RyhzjyPbX28DPEU/LcVQ+gZa0RJCv4a67zNqF+l8bzjMcNztEh6D0HBmNYgM3iR6Po7qeWO2CwX6eub7aHNHk824u1lNEF0NPMcpNkmZDmwQe/PREgLLtVENScTxWeYjUrckQbvgad8VIhFi+9Ly4MgPm2U1yTXZt6QPYRTzGK3o52GVkIuT0iQTdE8yzMfZWX3hrfEnVuHPcRo9Li0eesppVUJw=; 5:U8vwMTDBLB4vIwoEqHIYGe0PUMnqJGR0J8QsWpARCZp/bz7sE1UeKiP7d34P/IKFvRcdXkwEPPrso/yND6jX89wd8kzFXB59mdoVJdqfgtDzTdLQMr6Y038mmkufPZrkBC3F2FpC5dK8mEtbsTyhBDKHVpesSXSCVzBbEk+W4MQ=; 24:NQaCdY8iHH/y4JjaoSiUQDWPEDqvtMmgY4eUhGiR0moGlH7e0bln2mlq8yJ60WWNNUILL9LzD5f1BNFrolJs0jU8o8hAz+gw+xq4lrm0w3M=; 7:zpjITARMxkV+f4R95fihJV6t3MmLFnbncF9tZ4Q7b4aWfrjWvJtD3oF8f/DN0rE+b2OozcqEoLfrwUjGHlFTWbO27CVgB38uJ1MAGSty4Bd9NLa5PIGu2AAMRsZfBQBiYa7Qhd11HeT3AZmQOhaIZ9/6dSqCspfFDv2PW8d77oOB3fqV1FThxh9wiVOrqhGrO730E0mOmkwDie94pX7zp+HOifrh6FD9BPcmf0vaN1E0p9DklXWDjzoINK2Aydbn SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2018 11:00:23.1209 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 155c7ac8-ca80-4cde-2ffe-08d560be2cec X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3221 Cc: u-boot@lists.denx.de, Fabio Estevam Subject: [U-Boot] [PATCH V2 2/4] ARM: dts: add pinmux and tuning settings for HS200/SDR104 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The pinmux and tuning settings are from https://source.codeaurora.org/external/imx/linux-imx/tree/arch/ arm/boot/dts/imx7s.dtsi?h=imx_4.9.11_1.0.0_ga https://source.codeaurora.org/external/imx/linux-imx/tree/arch/ arm/boot/dts/imx7d-sdb.dts?h=imx_4.9.11_1.0.0_ga To support HS200 and SDR104, we need change pinmux settings dynamically. And configure tuning step and start tuning tap, otherwise you may see tuning failure. Signed-off-by: Peng Fan Cc: Stefano Babic Cc: Fabio Estevam Cc: Jaehoon Chung --- arch/arm/dts/imx7d-sdb.dts | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/arch/arm/dts/imx7d-sdb.dts b/arch/arm/dts/imx7d-sdb.dts index 85b83c351f..a9458993df 100644 --- a/arch/arm/dts/imx7d-sdb.dts +++ b/arch/arm/dts/imx7d-sdb.dts @@ -134,6 +134,28 @@ >; }; + pinctrl_usdhc1_100mhz: usdhc1grp_100mhz { + fsl,pins = < + MX7D_PAD_SD1_CMD__SD1_CMD 0x5a + MX7D_PAD_SD1_CLK__SD1_CLK 0x1a + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5a + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5a + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5a + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5a + >; + }; + + pinctrl_usdhc1_200mhz: usdhc1grp_200mhz { + fsl,pins = < + MX7D_PAD_SD1_CMD__SD1_CMD 0x5b + MX7D_PAD_SD1_CLK__SD1_CLK 0x1b + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5b + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5b + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5b + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5b + >; + }; + pinctrl_usdhc2: usdhc2grp { fsl,pins = < MX7D_PAD_SD2_CMD__SD2_CMD 0x59 @@ -147,6 +169,28 @@ >; }; + pinctrl_usdhc2_100mhz: usdhc2grp_100mhz { + fsl,pins = < + MX7D_PAD_SD2_CMD__SD2_CMD 0x5a + MX7D_PAD_SD2_CLK__SD2_CLK 0x1a + MX7D_PAD_SD2_DATA0__SD2_DATA0 0x5a + MX7D_PAD_SD2_DATA1__SD2_DATA1 0x5a + MX7D_PAD_SD2_DATA2__SD2_DATA2 0x5a + MX7D_PAD_SD2_DATA3__SD2_DATA3 0x5a + >; + }; + + pinctrl_usdhc2_200mhz: usdhc2grp_200mhz { + fsl,pins = < + MX7D_PAD_SD2_CMD__SD2_CMD 0x5b + MX7D_PAD_SD2_CLK__SD2_CLK 0x1b + MX7D_PAD_SD2_DATA0__SD2_DATA0 0x5b + MX7D_PAD_SD2_DATA1__SD2_DATA1 0x5b + MX7D_PAD_SD2_DATA2__SD2_DATA2 0x5b + MX7D_PAD_SD2_DATA3__SD2_DATA3 0x5b + >; + }; + pinctrl_usdhc3: usdhc3grp { fsl,pins = < MX7D_PAD_SD3_CMD__SD3_CMD 0x59 @@ -162,6 +206,38 @@ MX7D_PAD_SD3_STROBE__SD3_STROBE 0x19 >; }; + + pinctrl_usdhc3_100mhz: usdhc3grp_100mhz { + fsl,pins = < + MX7D_PAD_SD3_CMD__SD3_CMD 0x5a + MX7D_PAD_SD3_CLK__SD3_CLK 0x1a + MX7D_PAD_SD3_DATA0__SD3_DATA0 0x5a + MX7D_PAD_SD3_DATA1__SD3_DATA1 0x5a + MX7D_PAD_SD3_DATA2__SD3_DATA2 0x5a + MX7D_PAD_SD3_DATA3__SD3_DATA3 0x5a + MX7D_PAD_SD3_DATA4__SD3_DATA4 0x5a + MX7D_PAD_SD3_DATA5__SD3_DATA5 0x5a + MX7D_PAD_SD3_DATA6__SD3_DATA6 0x5a + MX7D_PAD_SD3_DATA7__SD3_DATA7 0x5a + MX7D_PAD_SD3_STROBE__SD3_STROBE 0x1a + >; + }; + + pinctrl_usdhc3_200mhz: usdhc3grp_200mhz { + fsl,pins = < + MX7D_PAD_SD3_CMD__SD3_CMD 0x5b + MX7D_PAD_SD3_CLK__SD3_CLK 0x1b + MX7D_PAD_SD3_DATA0__SD3_DATA0 0x5b + MX7D_PAD_SD3_DATA1__SD3_DATA1 0x5b + MX7D_PAD_SD3_DATA2__SD3_DATA2 0x5b + MX7D_PAD_SD3_DATA3__SD3_DATA3 0x5b + MX7D_PAD_SD3_DATA4__SD3_DATA4 0x5b + MX7D_PAD_SD3_DATA5__SD3_DATA5 0x5b + MX7D_PAD_SD3_DATA6__SD3_DATA6 0x5b + MX7D_PAD_SD3_DATA7__SD3_DATA7 0x5b + MX7D_PAD_SD3_STROBE__SD3_STROBE 0x1b + >; + }; }; }; @@ -287,23 +363,35 @@ &usdhc1 { pinctrl-names = "default", "state_100mhz", "state_200mhz"; pinctrl-0 = <&pinctrl_usdhc1>, <&pinctrl_usdhc1_gpio>; + pinctrl-1 = <&pinctrl_usdhc1_100mhz>, <&pinctrl_usdhc1_gpio>; + pinctrl-2 = <&pinctrl_usdhc1_200mhz>, <&pinctrl_usdhc1_gpio>; cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; wp-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; vmmc-supply = <®_sd1_vmmc>; + fsl,tuning-start-tap = <20>; + fsl,tuning-step= <2>; status = "okay"; }; &usdhc2 { pinctrl-names = "default", "state_100mhz", "state_200mhz"; pinctrl-0 = <&pinctrl_usdhc2>; + pinctrl-1 = <&pinctrl_usdhc2_100mhz>; + pinctrl-2 = <&pinctrl_usdhc2_200mhz>; non-removable; + fsl,tuning-start-tap = <20>; + fsl,tuning-step= <2>; status = "okay"; }; &usdhc3 { pinctrl-names = "default", "state_100mhz", "state_200mhz"; pinctrl-0 = <&pinctrl_usdhc3>; + pinctrl-1 = <&pinctrl_usdhc3_100mhz>; + pinctrl-2 = <&pinctrl_usdhc3_200mhz>; bus-width = <8>; non-removable; + fsl,tuning-start-tap = <20>; + fsl,tuning-step= <2>; status = "okay"; }; From patchwork Sun Jan 21 11:00:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 864030 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="RXLl9cTY"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zPWpX6mh4z9t3J for ; Sun, 21 Jan 2018 22:01:40 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 935ECC21FA6; Sun, 21 Jan 2018 11:01:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C3E08C21FF1; Sun, 21 Jan 2018 11:00:42 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A587AC21FC7; Sun, 21 Jan 2018 11:00:35 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr60057.outbound.protection.outlook.com [40.107.6.57]) by lists.denx.de (Postfix) with ESMTPS id 10086C2203C for ; Sun, 21 Jan 2018 11:00:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=kdTAXr6z3HM8dBVINc7go9BO8aQV9VcU5yW4ufNEdDU=; b=RXLl9cTYvZsvds+E2UduIKgFiUGa01EUoufWU2Bny6PL59wv3yf4cHfhF2SwYce6kim0zGvphQS3ojsYmJtV5HxVm27+LX4iKuA7uRl6R7i0u0dzkmuUAvhAkVGtciJhCQ7z5joJyxq1v9Qrw4C/R2/HBH0+A44QSN82Sj1CohA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from linux-u7w5.ap.freescale.net.net (92.121.68.129) by DB6PR04MB3221.eurprd04.prod.outlook.com (2603:10a6:6:6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Sun, 21 Jan 2018 11:00:26 +0000 From: Peng Fan To: sbabic@denx.de Date: Sun, 21 Jan 2018 19:00:24 +0800 Message-Id: <20180121110025.9645-3-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180121110025.9645-1-peng.fan@nxp.com> References: <20180121110025.9645-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2PR0302CA0005.apcprd03.prod.outlook.com (2603:1096:202::15) To DB6PR04MB3221.eurprd04.prod.outlook.com (2603:10a6:6:6::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 62c675c7-2c33-4bef-78c6-08d560be2ecb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DB6PR04MB3221; X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 3:ORQay8BChVSRzs2roTvuQpBimUIY5S48NRushaS5QOE4GgfN3YKHoPw7HxNtLM//S4/4CoEqJoCszH+5xzMnKgyApJPH4udLVrRBh41DrtJuxUWQxgvE3F4SUDF2JwF/nrEiS69yGzcDyDhOm25hWSuD/RHpON7S7gpa7ZkyBv0DB7gWmlwrVn+CS1N86uXKGainjbH8ZxbpIoSMbgf5xD3PcuI3TalC9GaqIdfbIOOgVShk90+J4NIvw4rahYae; 25:XTQMnT8nrTDQGW7Ro1xZ648iyQwNakBOe0OHRhROxNWOhbGipvNCZ6UFlrAUoNpnqQ8Rl4O9VCtAzr3BSrPmbNrDrMQLCvUn93RcYiHoOvcVUE+WaQqGCgIBDMEx9B9vP62tlRlMAqQVn/DKIeercR6FsxgKO3FOry3+vTYWM8t6xgXq9hifo+HoLjIMo8RikReU5/IfSmjffosjmZsSPkoDrh47u7kx0fI+1cN55dF/at2QWqfDDB3oGDdl9CIf10uUmw8MJOjeFeTQiDXwHpvZ8cFR/FwvMx8w+EPFupdd2ystXnx71tomHRIfKFlinNwvD1biUAU5anbKDrPl4A==; 31:qIzzLIiJp6esFysOJCWyi5gnTYSMOvyUPFVm8SJ/kycOLfY1Hu50SgQooLmKzR08ItnHfBiZsKv9CwQnMnHN+2IVScySU1dZwKH8PNw8hfre54x84gS33VgwIpEkTgpos7w99FdGmYpih8Wl8a1Z/XG/hQrs2X5jwl5sOfnx2eNGhsuK/Fe023YDXW1FgXJvSMslgWGW2cK0jW9KZ5YRJ9oTl6K4nlNKVG+hXENz9fk= X-MS-TrafficTypeDiagnostic: DB6PR04MB3221: X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 20:lHSsHIVWt1qgIYtlET/1ZHH3hENJNC+Lf4nggaBjK5/ckZ8YZAytC0hvQnQVogSCJrBf83UmJhY0ebtw6BtbisLkPyXzIFjrJJ2OuuTMBNHkFS5PRaoEKP/WZW7I8J0KdAZ0f+u+SyjcPiDY179qj9bq6vN+8vvNyGyk1g1Yk70WKo+jlFofT/6Q+TAGibUtlZzVQsrIpn105GKdg89qB9GN++w32V1v5DXXLOvAnNtleJWj228bKTj1yjrvdJeo8XYM/czmLTX+WxrHAyhjKdsGwjDm4ptopoZmdDQoMehyRbB7pjRutX3lk6+66Mj9p767MZEvGPN3Vmb2HcZTEUbWXnpj0djp+zVt9VNieOnysdlDZlVIg6HVr5Lmqjk9JaBkZzhLm8LCT8BMfwaQWM8vsoczgjHWqJCfMyrWk383fULcTZ8XKKhFVzgk5vVdq5uHoanwe6RZNT5pzpqlKgXK1qJMkVvIGmnKYk1haw241IYC/W/0iuyE8xfOgt9Q; 4:f2MjQQYKrHwO1Sh9iKWKTnLvHKvad2kuWuo+ESHdrelehENdEj77xNDKFrC20dnb+huslIv14AFos0ln8bRS+yDA+MXSEJNwGvGun/pGeZaiWdg1kKvU0/SwP4zBjjezwTDgzn1gtzsejTQscByDTkO2nheNcmmWv93OufAbJ4dW5Q4YyHb2WUPEsqS5DUk/g8dYthSMv1xILyLo+ThCxZPDD7omwt0h7o1FSJS6QEgcnU4VJhVfu3kL8dPPp8CsIXvpawePlN2RrpPrDO0N2CFXXNIQY1rtnP/p2ryloAXQedpOsDxA+nB0EelJ7iIgFXyMN1Rqg1q4eEpU1/cq/WLnQ2sZmoM7QalOgrNCoY9KDdVYY7VYL/1I2KDXmPYv X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(788757137089)(7411616537696); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(3231023)(2400081)(944501161)(10201501046)(93006095)(93001095)(3002001)(6055026)(6041288)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:DB6PR04MB3221; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DB6PR04MB3221; X-Forefront-PRVS: 0559FB9674 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(346002)(376002)(366004)(39860400002)(39380400002)(189003)(199004)(47776003)(52116002)(48376002)(6512007)(53936002)(76176011)(97736004)(105586002)(59450400001)(386003)(6506007)(51416003)(81166006)(7736002)(6916009)(8936002)(8676002)(2950100002)(81156014)(50226002)(16586007)(106356001)(2361001)(2351001)(305945005)(68736007)(66066001)(316002)(25786009)(478600001)(2906002)(36756003)(26005)(54906003)(6486002)(5660300001)(1076002)(3846002)(6116002)(16526018)(86362001)(4326008)(39060400002)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR04MB3221; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR04MB3221; 23:F3vvoVgzbKcplxbVxc9eZbiGUcbOQMXMigsMFECap?= VfLaBRIpf0RqoWEh1FPmoGRuskLqyRTy3Bc3R/Fnd7SlhubBqxY75D3K9GGzqNH5LoCmEHs0QUETYb6ci9e+SNBakNxR6vHJtMcuHF6Al446hpptySMAbdG1mVQkQ6nCR9Fug3o3+uhMChJDH9yPMhetGRFq646duVHIb+giWiSgMC5LSX9dP9lx/azt78XmM73SkMMNUEeQ6EsBry9g7KH0aOgnGqN6E/XOeiynvKYuRaJTsM5AMYPgAxaAd7/a8sseemfQh6uBQh1lBpVkvm8ba1W/XjDfd/Zd9vF2QlNjtXn153EnGkiMYL/rwOOpW2X/Ck5BSDI4sc0cMA3nGp2lShb83GtVuacNEataiowTSRyJM0VJDS738Qd+Jr88LazwiAyx1UswjjFk1p9uCjnrlBFXBf66/NAtXpKvxo9Q6uebPaY01vT1ru1PE1roBYbfPea7ZAyfetc5uM9N7UjKS8bA436VJsNZuvaBSe+sTV1USBP2lh1cdmx2+0Qod2dexuKiiZP0gRCohhp8zN645/WYFkhAgfMl14WvgYPj+hmXAfXK5vWYTj8mG3muCN0CL13zB17Dfx5XY6AMb5Gi9UIcipjymJwPoDAHIjzvSd/N5EWOJm90j0tf7bVl9cpSQERpgztborjJylUE1tE7BIZbeVf4xIn1CvX3Vx4Px+IIsBtV5YTPp5q2TkLTWvuRWEIPFDk5iyBOL5EE3OcyfyoS4X02UfjSF/oEWGAZ2Jw/2ApQiJGi59X3TheL6N5iSkZh+BHyecmD0VrOZwK+57PRLr4ogWFAl/dyz6VjxEw1rmGWPoCMs+Hm11MWeb7zmCgqQ7y0SyUr2rDw4lAHx9CBnLlkPoyTsKqpKYlRlf6QqKEMRnCmEaCHJcNzP1lRqq5mQCOZePkvwa64REJdGGWMJdwRu5FzH5awA+Hk7oZeYdyamkMnZErC3X3A9MKJuMY+ytYXz1tQIKQYGf7AGN73njK1X2D2rIHYD0m/SsPzkmmVHULzuO5EJkjn1PCcu8u98PUyiOUkvUj49zsGc0fwko3dmJf3EP5YllsyVOGcub2UCvQJjJbxuaF/tQ5EIAZmqvv/MVTM7b82gBKzsLKwVjqEoVaXYYVTpjOeoqWEFXAAh0FY9c+Fna/qFmegwTGMW2BNaRhlxAXQTuo X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 6:WSY406/4Qvv2kpqcmvVA6KtLL5th1UwPjgZacRzA1YU3gn+FlojuG8xLYTsrZPPJ2YOIdOhTPhJzgCMIPq2XV3w7mtmL0xvVbA/8/l8Z+r5dQb/f/9k73rSVpHdE0teFJNV5wzwSs3+bg4ZaSlVfquM2wq2piZnPtb7KwibadHcCprEJuTakC/kpCoJRS05usfjlAHg+gKpSiww963hNLN/68mt7NiNAP6HYUj9nV/al1kwRGSCJDyKyQyJ4xCvOTwXi+7DiZb1SiN5Fba+kpuLxBBAW3jh14md/SoZd0lZd8fCNDn2aTnW4CFmpUMSUb6JzOo4vD4UdI60hGxvLYMY/gMV4Mo19sOLu2dbXc3A=; 5:ZBbBE3A36nwBeICN+KaU/hJrQDUtEGdp007LQbR62j0mYcSWbHgW4BifwKWKwNR+wgXcq6gy4vNj3r9xj9VVHBZRy46DFfWDW29afSYfRGvlvE5Ugez2fvQlXGO/LtiFa1bVM1Hf5HWPELO27nfIijbOqU7+to9E81md00UN2Mo=; 24:Vh4PRJWv/iH57AfWxp94Gbw80rvuXCfYducigU5AOgjAjBPX48qyo1iFQSzKfznkkH3FYA6OeutecxGB9ZgY9NRqcZC0ofJeFnXy+5DPfKc=; 7:xJZvsk0fSBphlipiT9Vnado2MLNzs7HgIVlMcahEnQ4LrwBNEVeZIa4VWskcQY47yydK4453TlCf0uFhx2Svxz/GcT2Z99cxKkRibrJVjD8dPKWntOvKKM/YUI7TZ/CCTYHXSoynt4ga78sIIccWvWbvdMzRkuZyVIuPiH2JT56ja331LXVh8cuNZuhikvaR6bxhOnJrpe4OiFEnF2pNfsZieFjzodhui3n7RLCz7UAt4m2zjLo5esuOBoIAROLu SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2018 11:00:26.2615 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 62c675c7-2c33-4bef-78c6-08d560be2ecb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3221 Cc: u-boot@lists.denx.de, Fabio Estevam Subject: [U-Boot] [PATCH V2 3/4] mmc: fsl_esdhc: support SDR104 and HS200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Introduce SDR104 and HS200 support The implementation takes linux kernel sdhci.c and sdhci-esdhc-imx.c as reference. - Implement esdhc_change_pinstate to dynamically change pad settings - Implement esdhc_set_timing - Implement esdhc_set_voltage to switch voltage - Implement fsl_esdhc_execute_tuning to execute time process - Enlarge the cfg->f_max to 200MHz. - Parse fsl,tuning-step, fsl,tuning-start-tap and fsl,strobe-dll-delay-target from device tree. - Parse no-1-8-v property - Introduce esdhc_soc_data to indicate the flags and caps Signed-off-by: Peng Fan Cc: Stefano Babic Cc: Fabio Estevam Cc: Jaehoon Chung Reviewed-by: Jaehoon Chung --- V2: Use MAX_TUNING_LOOP to replace 40 Simplify code according to Jaehoon's comments Use CONFIG_DM_REGULATOR to wrap regulator code. drivers/mmc/fsl_esdhc.c | 363 +++++++++++++++++++++++++++++++++++++++++++++++- include/fsl_esdhc.h | 47 +++++++ 2 files changed, 405 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index f6279307d8..cf41796f23 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -23,6 +23,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -32,6 +33,7 @@ DECLARE_GLOBAL_DATA_PTR; IRQSTATEN_CIE | IRQSTATEN_DTOE | IRQSTATEN_DCE | \ IRQSTATEN_DEBE | IRQSTATEN_BRR | IRQSTATEN_BWR | \ IRQSTATEN_DINT) +#define MAX_TUNING_LOOP 40 struct fsl_esdhc { uint dsaddr; /* SDMA system address register */ @@ -90,6 +92,11 @@ struct fsl_esdhc_plat { struct mmc mmc; }; +struct esdhc_soc_data { + u32 flags; + u32 caps; +}; + /** * struct fsl_esdhc_priv * @@ -103,12 +110,20 @@ struct fsl_esdhc_plat { * @non_removable: 0: removable; 1: non-removable * @wp_enable: 1: enable checking wp; 0: no check * @vs18_enable: 1: use 1.8V voltage; 0: use 3.3V + * @flags: ESDHC_FLAG_xx in include/fsl_esdhc.h + * @caps: controller capabilities + * @tuning_step: tuning step setting in tuning_ctrl register + * @start_tuning_tap: the start point for tuning in tuning_ctrl register + * @strobe_dll_delay_target: settings in strobe_dllctrl + * @signal_voltage: indicating the current voltage * @cd_gpio: gpio for card detection * @wp_gpio: gpio for write protection */ struct fsl_esdhc_priv { struct fsl_esdhc *esdhc_regs; unsigned int sdhc_clk; + unsigned int clock; + unsigned int mode; unsigned int bus_width; #if !CONFIG_IS_ENABLED(BLK) struct mmc *mmc; @@ -117,6 +132,16 @@ struct fsl_esdhc_priv { int non_removable; int wp_enable; int vs18_enable; + u32 flags; + u32 caps; + u32 tuning_step; + u32 tuning_start_tap; + u32 strobe_dll_delay_target; + u32 signal_voltage; +#if IS_ENABLED(CONFIG_DM_REGULATOR) + struct udevice *vqmmc_dev; + struct udevice *vmmc_dev; +#endif #ifdef CONFIG_DM_GPIO struct gpio_desc cd_gpio; struct gpio_desc wp_gpio; @@ -364,6 +389,7 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc, int err = 0; uint xfertyp; uint irqstat; + u32 flags = IRQSTAT_CC | IRQSTAT_CTOE; struct fsl_esdhc *regs = priv->esdhc_regs; #ifdef CONFIG_SYS_FSL_ERRATUM_ESDHC111 @@ -417,8 +443,12 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc, esdhc_write32(®s->xfertyp, xfertyp); #endif + if ((cmd->cmdidx == MMC_CMD_SEND_TUNING_BLOCK) || + (cmd->cmdidx == MMC_CMD_SEND_TUNING_BLOCK_HS200)) + flags = IRQSTAT_BRR; + /* Wait for the command to complete */ - while (!(esdhc_read32(®s->irqstat) & (IRQSTAT_CC | IRQSTAT_CTOE))) + while (!(esdhc_read32(®s->irqstat) & flags)) ; irqstat = esdhc_read32(®s->irqstat); @@ -480,6 +510,12 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc, #ifdef CONFIG_SYS_FSL_ESDHC_USE_PIO esdhc_pio_read_write(priv, data); #else + flags = DATA_COMPLETE; + if ((cmd->cmdidx == MMC_CMD_SEND_TUNING_BLOCK) || + (cmd->cmdidx == MMC_CMD_SEND_TUNING_BLOCK_HS200)) { + flags = IRQSTAT_BRR; + } + do { irqstat = esdhc_read32(®s->irqstat); @@ -492,7 +528,7 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc, err = -ECOMM; goto out; } - } while ((irqstat & DATA_COMPLETE) != DATA_COMPLETE); + } while ((irqstat & flags) != flags); /* * Need invalidate the dcache here again to avoid any @@ -573,6 +609,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock) esdhc_setbits32(®s->sysctl, SYSCTL_PEREN | SYSCTL_CKEN); #endif + priv->clock = clock; } #ifdef CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK @@ -604,9 +641,239 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable) } #endif +#ifdef MMC_SUPPORTS_TUNING +static int esdhc_change_pinstate(struct udevice *dev) +{ + struct fsl_esdhc_priv *priv = dev_get_priv(dev); + int ret; + + switch (priv->mode) { + case UHS_SDR50: + case UHS_DDR50: + ret = pinctrl_select_state(dev, "state_100mhz"); + break; + case UHS_SDR104: + case MMC_HS_200: + ret = pinctrl_select_state(dev, "state_200mhz"); + break; + default: + ret = pinctrl_select_state(dev, "default"); + break; + } + + if (ret) + printf("%s %d error\n", __func__, priv->mode); + + return ret; +} + +static void esdhc_reset_tuning(struct mmc *mmc) +{ + struct fsl_esdhc_priv *priv = dev_get_priv(mmc->dev); + struct fsl_esdhc *regs = priv->esdhc_regs; + + if (priv->flags & ESDHC_FLAG_USDHC) { + if (priv->flags & ESDHC_FLAG_STD_TUNING) { + esdhc_clrbits32(®s->autoc12err, + MIX_CTRL_SMPCLK_SEL | + MIX_CTRL_EXE_TUNE); + } + } +} + +static int esdhc_set_timing(struct mmc *mmc) +{ + struct fsl_esdhc_priv *priv = dev_get_priv(mmc->dev); + struct fsl_esdhc *regs = priv->esdhc_regs; + u32 mixctrl; + + mixctrl = readl(®s->mixctrl); + mixctrl &= ~(MIX_CTRL_DDREN | MIX_CTRL_HS400_EN); + + switch (mmc->selected_mode) { + case MMC_LEGACY: + case SD_LEGACY: + esdhc_reset_tuning(mmc); + break; + case MMC_HS: + case MMC_HS_52: + case MMC_HS_200: + case SD_HS: + case UHS_SDR12: + case UHS_SDR25: + case UHS_SDR50: + case UHS_SDR104: + writel(mixctrl, ®s->mixctrl); + break; + case UHS_DDR50: + case MMC_DDR_52: + mixctrl |= MIX_CTRL_DDREN; + writel(mixctrl, ®s->mixctrl); + break; + default: + printf("Not supported %d\n", mmc->selected_mode); + return -EINVAL; + } + + priv->mode = mmc->selected_mode; + + return esdhc_change_pinstate(mmc->dev); +} + +static int esdhc_set_voltage(struct mmc *mmc) +{ + struct fsl_esdhc_priv *priv = dev_get_priv(mmc->dev); + struct fsl_esdhc *regs = priv->esdhc_regs; + int ret; + + priv->signal_voltage = mmc->signal_voltage; + switch (mmc->signal_voltage) { + case MMC_SIGNAL_VOLTAGE_330: + if (priv->vs18_enable) + return -EIO; +#ifdef CONFIG_DM_REGULATOR + if (!IS_ERR_OR_NULL(priv->vqmmc_dev)) { + ret = regulator_set_value(priv->vqmmc_dev, 3300000); + if (ret) { + printf("Setting to 3.3V error"); + return -EIO; + } + /* Wait for 5ms */ + mdelay(5); + } +#endif + + esdhc_clrbits32(®s->vendorspec, ESDHC_VENDORSPEC_VSELECT); + if (!(esdhc_read32(®s->vendorspec) & + ESDHC_VENDORSPEC_VSELECT)) + return 0; + + return -EAGAIN; + case MMC_SIGNAL_VOLTAGE_180: +#ifdef CONFIG_DM_REGULATOR + if (!IS_ERR_OR_NULL(priv->vqmmc_dev)) { + ret = regulator_set_value(priv->vqmmc_dev, 1800000); + if (ret) { + printf("Setting to 1.8V error"); + return -EIO; + } + } +#endif + esdhc_setbits32(®s->vendorspec, ESDHC_VENDORSPEC_VSELECT); + if (esdhc_read32(®s->vendorspec) & ESDHC_VENDORSPEC_VSELECT) + return 0; + + return -EAGAIN; + case MMC_SIGNAL_VOLTAGE_120: + return -ENOTSUPP; + default: + return 0; + } +} + +static void esdhc_stop_tuning(struct mmc *mmc) +{ + struct mmc_cmd cmd; + + cmd.cmdidx = MMC_CMD_STOP_TRANSMISSION; + cmd.cmdarg = 0; + cmd.resp_type = MMC_RSP_R1b; + + dm_mmc_send_cmd(mmc->dev, &cmd, NULL); +} + +static int fsl_esdhc_execute_tuning(struct udevice *dev, uint32_t opcode) +{ + struct fsl_esdhc_plat *plat = dev_get_platdata(dev); + struct fsl_esdhc_priv *priv = dev_get_priv(dev); + struct fsl_esdhc *regs = priv->esdhc_regs; + struct mmc *mmc = &plat->mmc; + u32 irqstaten = readl(®s->irqstaten); + u32 irqsigen = readl(®s->irqsigen); + int i, ret = -ETIMEDOUT; + u32 val, mixctrl; + + /* clock tuning is not needed for upto 52MHz */ + if (mmc->clock <= 52000000) + return 0; + + /* This is readw/writew SDHCI_HOST_CONTROL2 when tuning */ + if (priv->flags & ESDHC_FLAG_STD_TUNING) { + val = readl(®s->autoc12err); + mixctrl = readl(®s->mixctrl); + val &= ~MIX_CTRL_SMPCLK_SEL; + mixctrl &= ~(MIX_CTRL_FBCLK_SEL | MIX_CTRL_AUTO_TUNE_EN); + + val |= MIX_CTRL_EXE_TUNE; + mixctrl |= MIX_CTRL_FBCLK_SEL | MIX_CTRL_AUTO_TUNE_EN; + + writel(val, ®s->autoc12err); + writel(mixctrl, ®s->mixctrl); + } + + /* sdhci_writew(host, SDHCI_TRNS_READ, SDHCI_TRANSFER_MODE); */ + mixctrl = readl(®s->mixctrl); + mixctrl = MIX_CTRL_DTDSEL_READ | (mixctrl & ~MIX_CTRL_SDHCI_MASK); + writel(mixctrl, ®s->mixctrl); + + writel(IRQSTATEN_BRR, ®s->irqstaten); + writel(IRQSTATEN_BRR, ®s->irqsigen); + + /* + * Issue opcode repeatedly till Execute Tuning is set to 0 or the number + * of loops reaches 40 times. + */ + for (i = 0; i < MAX_TUNING_LOOP; i++) { + u32 ctrl; + + if (opcode == MMC_CMD_SEND_TUNING_BLOCK_HS200) { + if (mmc->bus_width == 8) + writel(0x7080, ®s->blkattr); + else if (mmc->bus_width == 4) + writel(0x7040, ®s->blkattr); + } else { + writel(0x7040, ®s->blkattr); + } + + /* sdhci_writew(host, SDHCI_TRNS_READ, SDHCI_TRANSFER_MODE) */ + val = readl(®s->mixctrl); + val = MIX_CTRL_DTDSEL_READ | (val & ~MIX_CTRL_SDHCI_MASK); + writel(val, ®s->mixctrl); + + /* We are using STD tuning, no need to check return value */ + mmc_send_tuning(mmc, opcode, NULL); + + ctrl = readl(®s->autoc12err); + if ((!(ctrl & MIX_CTRL_EXE_TUNE)) && + (ctrl & MIX_CTRL_SMPCLK_SEL)) { + /* + * need to wait some time, make sure sd/mmc fininsh + * send out tuning data, otherwise, the sd/mmc can't + * response to any command when the card still out + * put the tuning data. + */ + mdelay(1); + ret = 0; + break; + } + + /* Add 1ms delay for SD and eMMC */ + mdelay(1); + } + + writel(irqstaten, ®s->irqstaten); + writel(irqsigen, ®s->irqsigen); + + esdhc_stop_tuning(mmc); + + return ret; +} +#endif + static int esdhc_set_ios_common(struct fsl_esdhc_priv *priv, struct mmc *mmc) { struct fsl_esdhc *regs = priv->esdhc_regs; + int ret __maybe_unused; #ifdef CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK /* Select to use peripheral clock */ @@ -615,7 +882,41 @@ static int esdhc_set_ios_common(struct fsl_esdhc_priv *priv, struct mmc *mmc) esdhc_clock_control(priv, true); #endif /* Set the clock speed */ - set_sysctl(priv, mmc, mmc->clock); + if (priv->clock != mmc->clock) + set_sysctl(priv, mmc, mmc->clock); + +#ifdef MMC_SUPPORTS_TUNING + if (mmc->clk_disable) { +#ifdef CONFIG_FSL_USDHC + esdhc_clrbits32(®s->vendorspec, VENDORSPEC_CKEN); +#else + esdhc_clrbits32(®s->sysctl, SYSCTL_CKEN); +#endif + } else { +#ifdef CONFIG_FSL_USDHC + esdhc_setbits32(®s->vendorspec, VENDORSPEC_PEREN | + VENDORSPEC_CKEN); +#else + esdhc_setbits32(®s->sysctl, SYSCTL_PEREN | SYSCTL_CKEN); +#endif + } + + if (priv->mode != mmc->selected_mode) { + ret = esdhc_set_timing(mmc); + if (ret) { + printf("esdhc_set_timing error %d\n", ret); + return ret; + } + } + + if (priv->signal_voltage != mmc->signal_voltage) { + ret = esdhc_set_voltage(mmc); + if (ret) { + printf("esdhc_set_voltage error %d\n", ret); + return ret; + } + } +#endif /* Set the bus width */ esdhc_clrbits32(®s->proctl, PROCTL_DTW_4 | PROCTL_DTW_8); @@ -790,6 +1091,10 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, #ifndef CONFIG_FSL_USDHC esdhc_setbits32(®s->sysctl, SYSCTL_PEREN | SYSCTL_HCKEN | SYSCTL_IPGEN | SYSCTL_CKEN); + /* Clearing tuning bits in case ROM has set it already */ + esdhc_write32(®s->mixctrl, 0); + esdhc_write32(®s->autoc12err, 0); + esdhc_write32(®s->clktunectrlstatus, 0); #else esdhc_setbits32(®s->vendorspec, VENDORSPEC_PEREN | VENDORSPEC_HCKEN | VENDORSPEC_IPGEN | VENDORSPEC_CKEN); @@ -863,11 +1168,27 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, cfg->host_caps &= ~MMC_MODE_8BIT; #endif + cfg->host_caps |= priv->caps; + cfg->f_min = 400000; - cfg->f_max = min(priv->sdhc_clk, (u32)52000000); + cfg->f_max = min(priv->sdhc_clk, (u32)200000000); cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT; + writel(0, ®s->dllctrl); + if (priv->flags & ESDHC_FLAG_USDHC) { + if (priv->flags & ESDHC_FLAG_STD_TUNING) { + u32 val = readl(®s->tuning_ctrl); + + val |= ESDHC_STD_TUNING_EN; + val &= ~ESDHC_TUNING_START_TAP_MASK; + val |= priv->tuning_start_tap; + val &= ~ESDHC_TUNING_STEP_MASK; + val |= (priv->tuning_step) << ESDHC_TUNING_STEP_SHIFT; + writel(val, ®s->tuning_ctrl); + } + } + return 0; } @@ -1026,6 +1347,10 @@ static int fsl_esdhc_probe(struct udevice *dev) struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct fsl_esdhc_plat *plat = dev_get_platdata(dev); struct fsl_esdhc_priv *priv = dev_get_priv(dev); + const void *fdt = gd->fdt_blob; + int node = dev_of_offset(dev); + struct esdhc_soc_data *data = + (struct esdhc_soc_data *)dev_get_driver_data(dev); #ifdef CONFIG_DM_REGULATOR struct udevice *vqmmc_dev; #endif @@ -1040,6 +1365,11 @@ static int fsl_esdhc_probe(struct udevice *dev) priv->esdhc_regs = (struct fsl_esdhc *)addr; priv->dev = dev; + priv->mode = -1; + if (data) { + priv->flags = data->flags; + priv->caps = data->caps; + } val = dev_read_u32_default(dev, "bus-width", -1); if (val == 8) @@ -1049,6 +1379,15 @@ static int fsl_esdhc_probe(struct udevice *dev) else priv->bus_width = 1; + val = fdtdec_get_int(fdt, node, "fsl,tuning-step", 1); + priv->tuning_step = val; + val = fdtdec_get_int(fdt, node, "fsl,tuning-start-tap", + ESDHC_TUNING_START_TAP_DEFAULT); + priv->tuning_start_tap = val; + val = fdtdec_get_int(fdt, node, "fsl,strobe-dll-delay-target", + ESDHC_STROBE_DLL_CTRL_SLV_DLY_TARGET_DEFAULT); + priv->strobe_dll_delay_target = val; + if (dev_read_bool(dev, "non-removable")) { priv->non_removable = 1; } else { @@ -1090,6 +1429,9 @@ static int fsl_esdhc_probe(struct udevice *dev) } #endif + if (fdt_get_property(fdt, node, "no-1-8-v", NULL)) + priv->caps &= ~(UHS_CAPS | MMC_MODE_HS200); + /* * TODO: * Because lack of clk driver, if SDHC clk is not enabled, @@ -1162,15 +1504,26 @@ static const struct dm_mmc_ops fsl_esdhc_ops = { .get_cd = fsl_esdhc_get_cd, .send_cmd = fsl_esdhc_send_cmd, .set_ios = fsl_esdhc_set_ios, +#ifdef MMC_SUPPORTS_TUNING + .execute_tuning = fsl_esdhc_execute_tuning, +#endif }; #endif +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, + .caps = UHS_CAPS | MMC_MODE_HS200 | MMC_MODE_DDR_52MHz | + MMC_MODE_HS_52MHz | MMC_MODE_HS, +}; + static const struct udevice_id fsl_esdhc_ids[] = { { .compatible = "fsl,imx6ul-usdhc", }, { .compatible = "fsl,imx6sx-usdhc", }, { .compatible = "fsl,imx6sl-usdhc", }, { .compatible = "fsl,imx6q-usdhc", }, - { .compatible = "fsl,imx7d-usdhc", }, + { .compatible = "fsl,imx7d-usdhc", .data = (ulong)&usdhc_imx7d_data,}, { .compatible = "fsl,imx7ulp-usdhc", }, { .compatible = "fsl,esdhc", }, { /* sentinel */ } diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h index de1f5e7d9f..b341e018f2 100644 --- a/include/fsl_esdhc.h +++ b/include/fsl_esdhc.h @@ -10,6 +10,7 @@ #ifndef __FSL_ESDHC_H__ #define __FSL_ESDHC_H__ +#include #include #include @@ -173,6 +174,52 @@ #define ESDHC_VENDORSPEC_VSELECT 0x00000002 /* Use 1.8V */ +/* Imported from Linux Kernel drivers/mmc/host/sdhci-esdhc-imx.c */ +#define MIX_CTRL_DDREN BIT(3) +#define MIX_CTRL_DTDSEL_READ BIT(4) +#define MIX_CTRL_AC23EN BIT(7) +#define MIX_CTRL_EXE_TUNE BIT(22) +#define MIX_CTRL_SMPCLK_SEL BIT(23) +#define MIX_CTRL_AUTO_TUNE_EN BIT(24) +#define MIX_CTRL_FBCLK_SEL BIT(25) +#define MIX_CTRL_HS400_EN BIT(26) +#define MIX_CTRL_HS400_ES BIT(27) +/* Bits 3 and 6 are not SDHCI standard definitions */ +#define MIX_CTRL_SDHCI_MASK 0xb7 +/* Tuning bits */ +#define MIX_CTRL_TUNING_MASK 0x03c00000 + +/* strobe dll register */ +#define ESDHC_STROBE_DLL_CTRL 0x70 +#define ESDHC_STROBE_DLL_CTRL_ENABLE BIT(0) +#define ESDHC_STROBE_DLL_CTRL_RESET BIT(1) +#define ESDHC_STROBE_DLL_CTRL_SLV_DLY_TARGET_DEFAULT 0x7 +#define ESDHC_STROBE_DLL_CTRL_SLV_DLY_TARGET_SHIFT 3 + +#define ESDHC_STROBE_DLL_STATUS 0x74 +#define ESDHC_STROBE_DLL_STS_REF_LOCK BIT(1) +#define ESDHC_STROBE_DLL_STS_SLV_LOCK 0x1 +#define ESDHC_STROBE_DLL_CLK_FREQ 100000000 + +#define ESDHC_STD_TUNING_EN BIT(24) +/* NOTE: the minimum valid tuning start tap for mx6sl is 1 */ +#define ESDHC_TUNING_START_TAP_DEFAULT 0x1 +#define ESDHC_TUNING_START_TAP_MASK 0xff +#define ESDHC_TUNING_STEP_MASK 0x00070000 +#define ESDHC_TUNING_STEP_SHIFT 16 + +#define ESDHC_FLAG_MULTIBLK_NO_INT BIT(1) +#define ESDHC_FLAG_ENGCM07207 BIT(2) +#define ESDHC_FLAG_USDHC BIT(3) +#define ESDHC_FLAG_MAN_TUNING BIT(4) +#define ESDHC_FLAG_STD_TUNING BIT(5) +#define ESDHC_FLAG_HAVE_CAP1 BIT(6) +#define ESDHC_FLAG_ERR004536 BIT(7) +#define ESDHC_FLAG_HS200 BIT(8) +#define ESDHC_FLAG_HS400 BIT(9) +#define ESDHC_FLAG_ERR010450 BIT(10) +#define ESDHC_FLAG_HS400_ES BIT(11) + struct fsl_esdhc_cfg { phys_addr_t esdhc_base; u32 sdhc_clk; From patchwork Sun Jan 21 11:00:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 864031 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="gNesnfcA"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zPWqp5BrXz9t3J for ; Sun, 21 Jan 2018 22:02:46 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 66202C2203A; Sun, 21 Jan 2018 11:01:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A386CC22052; Sun, 21 Jan 2018 11:00:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 11104C22026; Sun, 21 Jan 2018 11:00:38 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr60042.outbound.protection.outlook.com [40.107.6.42]) by lists.denx.de (Postfix) with ESMTPS id 7B97DC22036 for ; Sun, 21 Jan 2018 11:00:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=E/ONK2Rimgk7UaFS5R0KuQ2+3oGEvbqDjU2kublQfV0=; b=gNesnfcAth2xvrLRHSNMe+hhQNtcE/nPO0JXB0idc70qFJCRgD+c57IocbLO/r4dBvDzkkDOmc1bBI03pvNNuQeFp4HwvMBSZoNEgGKX+tSlaSX0qpOcxLPyd0xF2LBdFgho/i6IVrKzgJ/NTrwXgCCout2FlYxF7CiaiGEaf3Y= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from linux-u7w5.ap.freescale.net.net (92.121.68.129) by DB6PR04MB3221.eurprd04.prod.outlook.com (2603:10a6:6:6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Sun, 21 Jan 2018 11:00:29 +0000 From: Peng Fan To: sbabic@denx.de Date: Sun, 21 Jan 2018 19:00:25 +0800 Message-Id: <20180121110025.9645-4-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180121110025.9645-1-peng.fan@nxp.com> References: <20180121110025.9645-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2PR0302CA0005.apcprd03.prod.outlook.com (2603:1096:202::15) To DB6PR04MB3221.eurprd04.prod.outlook.com (2603:10a6:6:6::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 9f6ba626-9ab3-4469-0b72-08d560be30e4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DB6PR04MB3221; X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 3:0OSklGxGs5JovSSVAAMPwc25+kebboeMdmWSfeUJ70u0EEEV3AuyeG0jpF7hs5XSUBoaysaS13lgChKDzj5vUqEgnPuYUFaj63wydAcy6+StN0pYlTJlCxRAvADGw7D+JBDyQosPNyamTc6NsW2bGJSXOxTsra+RpeHfHuToGAuDda/xSfn5a4VATYKJbJTH4vY0tVx+ZM1pgefVFe+39c3fVowwcF1svZU+Ad7QEtYg1MjOeviDqAbUvCZaAhgp; 25:N3bbEH6iijnjIn81b2J0hCVL60nIuE8zMvDstLv6MsgIRl0e3DyMhPVJHGVGIaQHKf8FzOUI0xfIJ67jX07FrJkOp0LosOMLZ+0lnvpAyiSUTejAzbat6ckLgoyO01Fr6WIpKbiBlNydf6idZR0S6SRe6E/AkK+sVVrHsNll3CgKoP9gR8cM+D/6L2BvYzFlSmoBP2bqXchMdhxNtpW9z4lnTDxFtgE4XdtnUXJmj680wJQ/MEXIIjnqQtSSEWqlY4WqBnPjAy7oNq8Ybl8RbAWDyPH32lgkQNLCqAkvOu+CYwyO6vUn50YL1mOt264WnfdvDpeur5tvwIGGRpgsJg==; 31:Lwpm7aOLHAVt0mjR8gr5GUdzHRtLwtUARt/G9fkz/19/U6lR8PgzswAg6+3AliilAGL80FIymaYfOaTYke3cMUKRPkYFP33WLd2Suyrl2NjV2MakkrSb9PewJpSWxDU1jca7Uy9sToRkcEeV4tTZQZxlxnzwc13MMqQvJ4c5kSidQwoIQdeZ/7FfOwMdSnFbO4ldO33E99ma29B5vPUrFL87S7HZ2cVhyC3IED9ri64= X-MS-TrafficTypeDiagnostic: DB6PR04MB3221: X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 20:tF9lkCrmucxmpKNqW97X2JloqAJzdJb0kW13bDun+mzn3sZ+Yg/hq27CKFi8y8iEUZsO2nrbAahps63M7F5EaPrJhWCPrE9s8WcCT780HxdduXSnUxKCFeJeMwVKisSeuCZ38WAKXMeBUsExQ9lxMSfPL9XbKsBPibIOpAvsVxhVLxvO8ui1iiiV+9HWDr7OREJpRJuOElIuP7TiGW3fmDaEuUO4qpPxDN5fOboK3L/MLtsJQeyxsdH4HUePzXMwoNDNjf5ciQLfFW5L/nY4if1WHCu8m3PEMmVZ7iw1+zhiD1aIPR37FN8iP/U67QI880xSuJ1KKv9iQR4OjgWO8hSrH1r+KbTI0oVWCsKQNijA51X42wVq16Em1xBfVTa+CNYk65dW5/QCbnULtCXeUlauO7iYg2ifETh2pP9qGNET5a3wX1btA6nNl/tQJSJb9Ja4MxYsEDmMrtenqUkjjU9V073t44fMSjlqW+NqTEJi1WEQc7Oif5peg3qWAzkq; 4:ak8yYX3+YeajqvxYi2AS9lbZChLedABSUftjflW7MBGRlnVpl6pZv0LSP90QOpaHT4hkQavW1/3Ad0tnOtrhbAyXahB6MdkNugeyEY8e6vF/sfGoyseUlj3jzLrJSbaP3UmJ3lveRYSuGXkSa0rLzUNE+SHCJzNAtSzeJuYqlKTTuwUC11fxERAs/vvUwqWKzVfdU/fMhMti+tBdAluQlPuVN/4DMrY9W9C6olOU8ZqkvZw+N2FRSqTtJo0CtwlpIzpLOScAmzXZr8adjrKE7rJ5NqBze4VVtqOXCRFUAc7GRfjfaqq20VHhsFPkOHN2ugzLHVi8h4Kpp+5sPbcEXY743b6S6tzHsutIlOiEOeQ= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(7411616537696); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(3231023)(2400081)(944501161)(10201501046)(93006095)(93001095)(3002001)(6055026)(6041288)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:DB6PR04MB3221; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DB6PR04MB3221; X-Forefront-PRVS: 0559FB9674 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(346002)(376002)(366004)(39860400002)(39380400002)(189003)(199004)(47776003)(52116002)(48376002)(6512007)(53936002)(76176011)(97736004)(105586002)(386003)(6506007)(51416003)(81166006)(7736002)(6916009)(8936002)(8676002)(2950100002)(6666003)(81156014)(50226002)(16586007)(106356001)(2361001)(2351001)(305945005)(68736007)(66066001)(316002)(25786009)(478600001)(2906002)(36756003)(26005)(54906003)(6486002)(5660300001)(1076002)(3846002)(6116002)(16526018)(86362001)(575784001)(4326008)(39060400002)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR04MB3221; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR04MB3221; 23:RHBQlZmEzGx57sCBunat2426Ow0/yRkSDg2f5+p+6?= 1ep9lOSO6t1e3fhgD+qh7BQgRvoXB/pHRGuEIlN7s691ZCl8/zVDQnhGBZdIB7LtAjpR8M577OZemt1YKMlbDUvv0trZopSj59t/w9eYjZmGKOY2ur7Ie5miPY/oWuCRB0e1Wsyli3ME57K7bW6T5AUG08zvxVNxpPwb7hQ94h/IhWgbLyjvAkflkmN4DZimJmwc9ee7n/aoyqFin90CABiRdhLbyAY1qNz9igYg5woKlV3PyRAKUY6xE9urZ+znhh7MBaaOSOJGjjbkD0IuguKpOhlczao8C7dkhozN/FhsAKWx48pAakhN9nL60NdCKVQ/8iFjK1+U6vc+DcHBzgQH6mqgyPwV/K/4cD6SXAshI1Wb9GD4CyqgSnE4Q3O4ZFxHqQOc1nmpumfFmrfgo+OadXk0zOJeoIgGgTjjMB3+Zik+2gGMIlvzsqlBY8hh5WouYZmR/z+Jl2XLhlnzZ4JQ1Faqe04wVZ6eEfuufuBF+UkhXJY+Uk/CtxaLALMF0CxYEpcA8wb55229jfdcOmZe4CVJ5JCN9eds6Ng5obWtpKfyGYkhdCgsXHOuX3TRArbu5nI4bzRUNZ9VFaAYZEgRXYeJ8R/ClbQ5DRwu3Avpc/R9P0h6+zsDPvLC/QjdKvpkXzxSqajlLYRahHRVhvpVsvj8QLXjABdNjdNmnR0+iJmiXr1hk91AOp+vXqSD+e0Qal/1zt9G6NES/0qV1JKdr2Vu0YmajGLKCUM+AaSJqvvAjXhGvORRwL0q8TPIOpYSzVQitbFpJT0AAMWuT9AT2N+zvATTuV55EHWLTHCTa2Cr9//l5HcAAcLopJE6Ad11AD4EeQahmpnpgnBo8JXYE1z6e8flmYfQNuPQHFsjBKE3gaWEpjsBxp/xvUZEYIRUT8MEbuN0t7zhdSdPJ0suBpm4Bhavpw+vIo3mwfPK8pAQYmOXQ17gRtDlblVrKaxVYsAh0ImeLcdVfVmQLtbpgfAYpyV4I28DwcJqPhkb+xv9egyB1iL55tUTkb8uyzc4GFb1Idkl6gsk6xLZxEZ1IQrs2/D9NssQ7IKODiLBP8N8Hq0tsTPBnEi+uUzDLisheyhat8ohVfDhxW9eabFf+xIXTGRPcrm9FiJP9wcE+SsGi9fJ2dLlTdABsCRBat34E4EYJ8ODKdVimgatxUf X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 6:JEUdKgeiNIgBOFkVBDfAHDWJBuNeEXoVi2Js+NocMzgk6dKPM0hvF+Zqy4+1rN8Q/rkCfkkQyMC4O8kYWuJxFw5z1My/dNrsYy8BIT5SR40SLs5r6QR5eFKks8RgOLJ4hm2qm2WUhvPY13mX/Q7O8nyB54LcyghtDF+ZT+wqanDtzmvASF2Pn69K2oSGIosXo2IVs7gX+9WRzQ9MmQ7PeuEctBw0Z0ULyMeRqjx1dOFluTIVhekoFo9Lq6Opb+UFSu/nuMY5ZogXj5IRewZgZxLq+IBHGpq2LkdHdjnOVYX5JW1LwtYkz+3nw9k2QUht4sBDNmhNtDqY33Ia8ig9OaCAukLPTaHSqI4dlJbfhVs=; 5:CFogbd2kMjNB5OdDHUYQVU2wU1+OX4cuPBuOTzQcXsnzpQOO/z6DXT5CgQUUIStvxZv7WkLJVR0sciN/6cSopME+sAWg25FQMIIcWdGLrKHtnvIGhW8UktheSl6Jm0R+ctDiyUiV736fmKB4YsAHBWwqkFBjGYChZCd3sAJRTjw=; 24:7s1XcNVRZDRny+JZ8CCfQjrwNhjWn6UAACgooCvSQU40FPqT9ouVap33aalRm0JdTfOzriaKeAqI4yiCIJxoOigoKbi5SGk72dVdDdr2qJY=; 7:qacZrt6rw6DBRTfXJe5IayKlgp37C6rlVk6XNqVlTHs7tYZaB3Grt5cHpgCHiENURemGWHNcQqprL1/rcvJdZeBsgff2IqZsMc4aWH+e9h1l4SrGTyhgdWA+UExIaZPLZqPGms2aPjhDwy4UNOy6lE637+sGp1mRHenhxkVNeT8Mey+JkC5yLvvkz2jzJIpkmhcSlEn/IdAqfw+dUEH2kJTGAPpIZpg2/FTUYxoGRn2JDJzqZVpwPhxQrf2KcyPg SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2018 11:00:29.7778 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9f6ba626-9ab3-4469-0b72-08d560be30e4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3221 Cc: u-boot@lists.denx.de, Fabio Estevam Subject: [U-Boot] [PATCH V2 4/4] imx: mx7dsabresd: enable UHS and HS200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enable UHS and HS200 for mx7dsabresd. Read Speed improvement: Kingston SD10VG2/16GB SDHC 3.0 card 22.2MB/s -> 73.7MB/s eMMC5.0 MTFC8GACAEAM: 68MB/s -> 87MB/s Signed-off-by: Peng Fan Cc: Stefano Babic Cc: Fabio Estevam Cc: Jaehoon Chung --- configs/mx7dsabresd_defconfig | 3 +++ configs/mx7dsabresd_secure_defconfig | 3 +++ 2 files changed, 6 insertions(+) diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig index 310c176083..9fd75b573b 100644 --- a/configs/mx7dsabresd_defconfig +++ b/configs/mx7dsabresd_defconfig @@ -41,6 +41,9 @@ CONFIG_DM_GPIO=y CONFIG_DM_74X164=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_MMC_UHS_SUPPORT=y +CONFIG_MMC_HS200_SUPPORT=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_PHYLIB=y diff --git a/configs/mx7dsabresd_secure_defconfig b/configs/mx7dsabresd_secure_defconfig index 4126d90746..7dcde7c0a4 100644 --- a/configs/mx7dsabresd_secure_defconfig +++ b/configs/mx7dsabresd_secure_defconfig @@ -43,6 +43,9 @@ CONFIG_DM_GPIO=y CONFIG_DM_74X164=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_MMC_UHS_SUPPORT=y +CONFIG_MMC_HS200_SUPPORT=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_PHYLIB=y