From patchwork Mon Nov 27 08:39:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 841517 X-Patchwork-Delegate: yorksun@freescale.com 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ylggT5rMgz9sPk for ; Mon, 27 Nov 2017 19:58:13 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 3546CC21C51; Mon, 27 Nov 2017 08:58:08 +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_H2, SPF_HELO_PASS 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 606E8C21D76; Mon, 27 Nov 2017 08:58:06 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1662EC21D56; Mon, 27 Nov 2017 08:58:05 +0000 (UTC) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0056.outbound.protection.outlook.com [104.47.42.56]) by lists.denx.de (Postfix) with ESMTPS id 480FBC21C51 for ; Mon, 27 Nov 2017 08:58:03 +0000 (UTC) Received: from BN6PR03CA0014.namprd03.prod.outlook.com (10.168.230.152) by CY4PR03MB2695.namprd03.prod.outlook.com (10.173.43.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.260.4; Mon, 27 Nov 2017 08:58:00 +0000 Received: from BN1BFFO11FD014.protection.gbl (2a01:111:f400:7c10::1:188) by BN6PR03CA0014.outlook.office365.com (2603:10b6:404:23::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.260.4 via Frontend Transport; Mon, 27 Nov 2017 08:58:00 +0000 Received-SPF: Fail (protection.outlook.com: domain of nxp.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 BN1BFFO11FD014.mail.protection.outlook.com (10.58.144.77) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.218.12 via Frontend Transport; Mon, 27 Nov 2017 08:58:00 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id vAR8vt21030617; Mon, 27 Nov 2017 01:57:56 -0700 From: Yangbo Lu To: , York Sun Date: Mon, 27 Nov 2017 16:39:03 +0800 Message-ID: <20171127083903.13123-1-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.14.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131562466805847088; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39380400002)(39860400002)(346002)(376002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(5660300001)(305945005)(36756003)(51416003)(8676002)(81166006)(81156014)(97736004)(47776003)(68736007)(1076002)(50466002)(4326008)(104016004)(48376002)(50986999)(498600001)(86362001)(575784001)(189998001)(77096006)(316002)(50226002)(110136005)(106466001)(16586007)(105606002)(356003)(2906002)(6666003)(33646002)(8936002)(8656006)(6636002)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2695; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD014; 1:lyFKI+Ebw123xbxEdUohDD4RpEEyeMpjEGLuIIncH40iUKjIHf87/g4VtfnWw6xNlssFPW5NeqSvn9bQ/5vj+6sVNtAkI9IqgGZNlTEFh0+H0l//hcWrvISCcKXqJzUO MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 511fe475-af47-4937-32d0-08d53574f631 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4628075)(201703131517081)(2017052603258); SRVR:CY4PR03MB2695; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2695; 3:hrzYyuLi7mvNJVcpRXq8tLDZ1Xbk6vbUcwXX2d6buaLOBDX+3mPlxYu3RYGLafL3QIaei/xniMhxZS/zIZQJAH+iZozSl8cpUi1HtImQKQpm2x0+ulj1kVTSOx5wcyVAJb+wDDXDeD4gyualjBiH6lzRL8JXVxwqn86XrtJD0pQOWbdArrQizEbTVTXSAyJu8EIvD98LR3PVAU0SBno0//jTOjX5R7ka+yRQrP1qXaBodCoLVQgSftmFIev90IQM9cpt5MnE1R8usCiLYU+cD9MGj0PLuO+4CKaBzv6IVb+rI5v5jBB6kRqVKPO+LlRrquOyMCg5krdDPTU0dsPoGKYsddtp+SJ0QWpR5odpC/s=; 25:DltfD9gq48C2b+KpcU4VHeZsIodJUe7elOOvMq1WiBG9qDUioxVPmsJ3f6eL/w6hsTDlzOmIpXLBzaJ7uVMr1DQhUesCA66AGds9MwcZWjcRQwefdSRAxCv6tkuTA0H5x9qkBdCUwCo8h+npZqzC9PU1jVfZprtG5nUSEPeqzNUE7lE5umKiBQHDJDxHc6WLRTJUuCUN8cqWIrUhXIq0a6BbLmZQS8vxCPz/tcq7TR/Flx1cPUtfqvm/f7TwDoYcct8QsDYJ9M92vWHGZ3333YJnO1wu1E3vTfLwszsfV/b5Ss9pvq28YOfnK1P9PYMWGMNSq8ofLkvIMCw9Nl+R5Q== X-MS-TrafficTypeDiagnostic: CY4PR03MB2695: X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2695; 31:s1H1UpD3zDVHrPRm7Z86AOL07tCmv15+A8n1Imsn4Q8LIO/F+T7Nw84UMMROC8bMOsU0dGRzfLZ/yzjKszyPE9vK3pAmyDhDdrnvJ2URzDluHds1v0hIDb8GGGxG6CJBMBGfHy98X/hmIM+oZ2GdvJImRJOLCyCSGTXXUjfIr5IdpGiHRqsr8Yopt9Ogq1xB3wU9D+tahMikPN8GXfcRAHeXZT6AASVnZvCtU8bx9Nw=; 4:PNp9YhtLWbXmV0bRime4/ET3mB2R0B4vqnObToLrRyj0v3ODFGH79XtU4+xqifM+CJRDskWluFHZ3GNyusO9M5l+7H1kkUHd0oK2ydyBRKCYqsHETN0i8VCbpZu2jBxLYBcKAZ9zgKCocow7oqFg9VjwYURB4MTKFmLqYmIB0ZVQvYi16Jx79G5vDfLiyRQHISL2e9X18V400gt9tUXG6+xKUOrMTSLN3Rp0z2F2IDc+GjYg07BHLpsZhhhisMcxaTLEw7EVbuYPn+0nOtOGDN9M0DRYwUXxTYT4YH0vVVF43QFtmZ8UV+yYPAyk3uue X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231022)(6055026)(6096035)(20161123559100)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123561025)(20161123565025)(20161123563025)(20161123556025)(201708071742011); SRVR:CY4PR03MB2695; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:CY4PR03MB2695; X-Forefront-PRVS: 0504F29D72 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2695; 23:VlRXKomOVdPciqgJv9ayO7HOEEE2Ggxd6fVXY0oeZ?= faqH7zPBCMxvfSz8dCKMatbaTtKW+EzDc7w3Kn5DwB7dBIV7PYuNQf5MZ119mQNe0SN2LVtknogrOSCL7ynhLbp6KnPrDxO8gL0wJ2ystbiF+3a2Im2TuW+5hKl01ozNBJmxwgJQDYT7U9wXk9CHriDd9vXRznVSwnKWzqbN8wq+ZPuecjwSytJuqYp4bZdmmd+K8XAjtBHHCJR/mcULfeRm/hOhho5KgR4V9e+eoXMjumtsyFtnYsrAMsEh5enQvnng8/IqieoWpvr3VFQaxgvj+3GHxpBg583NQU0z4MbobyxVXdO9aAWLLFyITIEnFYhMbjvzl0Y1spxNKnzj6l2bosrncU9KYmVRz0JzlVx8Sxdo/l4qCqKtOO1SRFFDek7DrgqHcciyjdjkugSBpNI+vbo4Ug1FgWhUbsvGbiPwo4WkHUqukIVsA4aDJuxnyYOmnKCbz4mjHqw2H1WVZubpzma8Ter0vfJe01BC6NsvwlxgEOzETb7OA5mS9KdudgCV5SbuhaG2Fb+9BxRbdISJpGD7MxSceLTQm0O8nNbyP8FcSb1e4y+RXFrPT9cY4shxQYh2fBG3IDW2XmeM+pOuZV0HOhB1MaLunOE0FT4VnozRdl7uguUC2/zAImyqPgdAsAiYQ0V/BVwdKvXKHKKw16Wxa4M/wNiGXJbd0H2/7tXFza2aTWOl6KpFy0V8SSWq+tzCmt1r0Ph67Cm9vpAew76bK8cRSwAg0vQjmuj2M6KdD96GogY0s1nVq6JKn+9dBBAEF+ahKajl4dEJvqgJZRhu+pK2Q7Ic6xlL8LLx/2Wo5ybLlv50BpZtKRRs62/tZCZ+mVBG8+jZZyonxsiWFP0C4KQ7klFdy10EDSq9nNLFI17UNTGpZRxMZ1Ie1784+VhXpFLoi2IAZgwoN4t9vNXIWggD0yBbusXDuv1SPCuL53yqqpDrFX7eMIRV2qFBCS4SNIkWKar/FnRE2bpaUUEoctyE6f19jOVDIUDJsCdqLLStDwLSL8XCh272DOzwBdgd8yTz8Gn+/x5SOf9zE/7aBokR+nFrRRKTZ4eeg== X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2695; 6:trUAw1taokfKjgDLfgxFOS5K4Oky2kWi2wYNPclDoA2rIqACRe+XzaaxdtzrKSJ1t0oLVzuigzkVSn8zeTT0A4WeXXVX1zxXakEMsGLZHbGbyMr+SZkuxDgKVTgUr7LnrvdDDDW2rCwUDpvD1ZmSR2/hHzzEBCTB6tLf95GiHI+pe9VY1rprguPXzVxbUdlxhZGMz0LRHUm1CKNG7q/X+C86WtijWbq0Uh6ZWRpdJ9lFlVTlpsOXxJmNEzAkdp0ABvZleEKHt9fkhXgy31DGggNgZmdKPGmz6LKHMom32MPo9RsLmsixBuRjLcuKMTcN7RTTYZ+j0Z7Io2Wd4wykuQ==; 5:q38u7ETIGHNeilEaVkYLnmdnq84jkU8uiKY21ndeIHPpttlU0xIdkt1lRLQC2mKUBHMXYGD0TlsKgpIf4I+P2Gz5Ld/wE6vDMy6nGYHjXPUZQ8tqRZHbvIFo6H/MZ4d72M9cQaiiCnm4WXKdd69ITGkca555Ep1eNsbXT/xCp7I=; 24:QKZ8xfjG//+E6TooSSuulGScgrRXJf5CVn0iW8VYiclcz7sA2fXK62NpIAItuWdPy/XztSGYIpRjTl3mZZv72eGb7jPsqJNzhFfP/7eplTA=; 7:ZcMZyMbTo94mOxunYtvC//wLxFgnc4QiMG0M3viD38FfLz0iAFLG2u6AZN9kUKJeNvSllsiXLj8ZSVvqFhHs7gZZD1ffk0ekWjIObsFe8sjJpP+AA/uAUQ8TgBZZMmFQKJfL29/cSNbuVogeuIIx4Q9CcK0mGyfqeb0tW2I4Mp4+M4STmn8QorCtYwb9eZyhx0KAx6SNt8WqoFSlIYII4DD0X8PjIklvB0Us5Er5rLrlsIGWxcpEAHLatAtVmBrv SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Nov 2017 08:58:00.3975 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 511fe475-af47-4937-32d0-08d53574f631 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR03MB2695 Subject: [U-Boot] [v2] armv8: ls1012a: enable/disable eSDHC1 through hwconfig for RDB 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" For LS1012ARDB RevD and later versions, the I2C reading for DIP switch setting had been no longer reliable since the board was reworked. This patch is to add hwconfig support to enable/disable eSDHC1 manually. Signed-off-by: Yangbo Lu --- Changes for v2: - Just used hwconfig() instead of getenv() and hwconfig_f(). --- board/freescale/ls1012ardb/ls1012ardb.c | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c index c6c1c71202..3e2b9c27eb 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -132,39 +132,15 @@ int board_init(void) int esdhc_status_fixup(void *blob, const char *compat) { - char esdhc0_path[] = "/soc/esdhc@1560000"; char esdhc1_path[] = "/soc/esdhc@1580000"; - u8 io = 0; - u8 mux_sdhc2; - do_fixup_by_path(blob, esdhc0_path, "status", "okay", - sizeof("okay"), 1); - - i2c_set_bus_num(0); - - /* - * The I2C IO-expander for mux select is used to control the muxing - * of various onboard interfaces. - * - * IO1[3:2] indicates SDHC2 interface demultiplexer select lines. - * 00 - SDIO wifi - * 01 - GPIO (to Arduino) - * 10 - eMMC Memory - * 11 - SPI - */ - if (i2c_read(I2C_MUX_IO1_ADDR, 0, 1, &io, 1) < 0) { - printf("Error reading i2c boot information!\n"); - return 0; /* Don't want to hang() on this error */ - } - - mux_sdhc2 = (io & 0x0c) >> 2; - /* Enable SDHC2 only when use SDIO wifi and eMMC */ - if (mux_sdhc2 == 2 || mux_sdhc2 == 0) + if (hwconfig("esdhc1")) do_fixup_by_path(blob, esdhc1_path, "status", "okay", sizeof("okay"), 1); else do_fixup_by_path(blob, esdhc1_path, "status", "disabled", sizeof("disabled"), 1); + return 0; }