From patchwork Thu Nov 16 02:27:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 838372 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 3yclxm4RG7z9s7B for ; Thu, 16 Nov 2017 13:46:35 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 0C60BC21DA3; Thu, 16 Nov 2017 02:46:28 +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, 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 635F0C21D6A; Thu, 16 Nov 2017 02:46:25 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F3F6AC21D65; Thu, 16 Nov 2017 02:46:23 +0000 (UTC) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0088.outbound.protection.outlook.com [104.47.34.88]) by lists.denx.de (Postfix) with ESMTPS id 03A64C21D6A for ; Thu, 16 Nov 2017 02:46:22 +0000 (UTC) Received: from BN3PR03CA0074.namprd03.prod.outlook.com (10.167.1.162) by BN3PR03MB2354.namprd03.prod.outlook.com (10.166.74.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.6; Thu, 16 Nov 2017 02:46:19 +0000 Received: from BN1AFFO11FD042.protection.gbl (2a01:111:f400:7c10::191) by BN3PR03CA0074.outlook.office365.com (2a01:111:e400:7a4d::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.239.5 via Frontend Transport; Thu, 16 Nov 2017 02:46:19 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; 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 BN1AFFO11FD042.mail.protection.outlook.com (10.58.52.253) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Thu, 16 Nov 2017 02:46:18 +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 vAG2kFHa026445; Wed, 15 Nov 2017 19:46:16 -0700 From: Yangbo Lu To: , Prabhakar Kushwaha , Sumit Garg Date: Thu, 16 Nov 2017 10:27:52 +0800 Message-ID: <20171116022752.40410-1-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.14.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131552739791576623; (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)(7966004)(376002)(39380400002)(39860400002)(346002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(110136005)(8656006)(5660300001)(16586007)(8676002)(105606002)(6636002)(6666003)(498600001)(305945005)(97736004)(189998001)(106466001)(2906002)(36756003)(33646002)(81156014)(8936002)(85426001)(50986999)(68736007)(81166006)(575784001)(53936002)(316002)(50226002)(4326008)(5003940100001)(48376002)(104016004)(1076002)(77096006)(356003)(86362001)(50466002)(47776003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR03MB2354; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD042; 1:kqwieVtw81W5eUCa8okQZjqneSogCbdHDaiT00RMMNKVIBRXH04WxS9FqbKc4U/2MDmkB+k7cwClFPN/lel9GmhhG5KhnKKMxCrUepYEmijWg1t/pvcujdvdBOZrF1kE MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3e9e6fcd-d949-4b6f-3ccd-08d52c9c36f6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4628075)(201703131517081)(2017052603199); SRVR:BN3PR03MB2354; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2354; 3:UzJifHv/5wiBHr3GauqvvRMgO7WRliWaEI8y5unngXvmNv6akRymFW/QT+PZKlOAOQlO1Q3xxjfytzTuJs9EnJDjA3XvuM/INGobT2VAprwsf5bng7CiyUnKNae1PNWSfs/D7rSVNRao3P+qWwADbzmel+FelLLXnadelkCOwzVVeXxP0ilxU2oplfSgieBxbZCRzcxrcTCjhDo4hJ0C7UyXMG77gyLCz5YcrhJajmNu8EBlFOxcowttl0m/v0LOadzlnIoY7abQ6SVaCEbF8AyNSvK8/gNpTBqZGfi5UzsVaVr9BrEz/+RG4aoFS/rwBrisjfpm8puE/uxMSJ8UzDDJWTqxruAJYLtUHFdkZSo=; 25:NxvkwBoMDShWnaYUtDZQMkbAQDit4LJGc5YprRNdx5SHbPJYEA0TIAOhtk90yKV2qPF1iTRFlHa6tMMsXxVzj9XHYUGl+2inrgDFrASwLHN3A2Pb9tUnJEnWIxUM80nH4/Yt1A5gzMYR7ZJXtqvEpQFgBOU6Exg3LSZq5lFKCTTe4sYpC0O5pFs88f/K1tKTVWnHmpEoh5grAZB06uV45wndgvdsf4TEPBQNp1leqFffPNJ3tUQp800cIf8xYdLgbU2mr24Jkjd05QYs+2UP+uEffz8p4IrnWvNLxp1WiWeaFE4yFQyCt8XtIs00KrlkBPYKDq/CVJBpfxBa+Br9wg== X-MS-TrafficTypeDiagnostic: BN3PR03MB2354: X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2354; 31:Lqji1R3joKiVuWp94luw4ATxQ5Mg/5GmmtSZvWvyj2/R1xlPbtr9fQQQxYYWYkj/DEN7hW49d3Y7RXeM2WQsG+XKe4Ml/b7PoLk2LdZH5kCczZARIheCjsuzNggcybZhXcUHF8WYiCVD2M4fTMom7tG0PdJF8haEamevG/dvrM5U9pUiG9qWpEcc9DYsbjIDi9ptJHvKrvQQ/IvFlt0SgmWc/gA1b4brcOCF8uHfYaM=; 4:ZlpPyHb+8fbSrCCVw5d3F0sxcbUFJ+3Zrs8sNqcv1plXq8IWMdiUcxVeGesAXMhzIIgvXd5Avn500fpANDhUBAgPBF8wGWm36k52pRQhUI2nKHMRab9odHkHoKPqFSdkcoFmwbcTopCXaNhT+U4Uxn3dX4FDL2/hq6U7JtVNmjk58OOPbxGTK/7tMrH6VVVE6x8MtL8HQXuM3h/h3VVq24bf6PX/rFP43thqiUfWJNaknICXZ4Q8pC6wDkB3rYGhwxl0KDf8ZnbVvlyPvSXMFG9+JG6G/g6oTKfWV/cnvGE3xCo9Gsbckd2/DAnX9z0K X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(3231022)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(6055026)(6096035)(20161123563025)(20161123565025)(20161123561025)(20161123559100)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123556025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN3PR03MB2354; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN3PR03MB2354; X-Forefront-PRVS: 0493852DA9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB2354; 23:Mtxv/D2ca19uedf094Ctz47Jcb1hPoN1+Es5eqAk4?= i+M44/qgpjUmY42/AkXL2J3ZdTyRHHp8l9xWWq8KnU/jqcsMLJgG8rxuodqcRab8fCiIkwwIXwBd5PcFcYtuHq187ONYDiioYG309ZKNEsveyj5nUnoAr/qImmrnwY7OwjD3OP0G8dzBnjLgqggb2wj3NFyS4IJLkhaEFd7l4iQcllTtMLBS/MGeZILHbYAcX2H/UCXPbxevXpQJC/bNTQE7+K4NjDOVNPYV/E3hJy6Di0TwfZ8VrWOXxnwgALKc/dMM47QtdJUoPiQbJriuMf+lvDnGfsxu2dI6fHvnoEp0qcco9EbKN/aCqPtSDxE7INpeXysv7yZVsk4PlwvoAhpqlPt56E3zoShrGMGK0dxq2V0ePCK+UAgFWbkLQ8PLSwdb0IH4sXSs29II8AYCOaMjNspfkHQYCtSRzIuhpndRr2zYpVR0EqckIVpu4Bv4EfQc1KJikDOZKClzbuigP6yBs2Jd/HrngOmF4dzcsD1XmRYvRSHJt8mG3rhmDpqdTB8lOucmQTwUgZXr/oBcikRu/txQsDaJumV3YpVeg3CD5Tx8NlB84tvA7sriMbK21Dhrsnm938l938VtD4y/gwE0MSLsMdN0aCHmI5QG2/3ctRJ/lVCltECCr66La6UFT5YaNKjacweSSnKAxP1wPfQZ+azki/Kl79bs2UJfyUv0mXPhuow5/wml415vvPcwI284tZCN4a5RsFs1851Kh8T2bpmSoNAy8cU4n/OgoyETaTZekIpsfMpuhGv+gx2Nl0lMGOnKfLCg4uCwBDQLk6cftqJOzd9jTcoJ5Ne/+GYPZ8EICtSx4e28qI1ESVZFJ4GQ7NUiQArfgcnX+ZwoYKfk8XiJQpXZeMymXGYPMC9+UNAESCRLFaLLGXUCWBBT9460ZiCVv86c8cc0HP6T12Xuaq4LQSxsY4sZertpJ/zbAST9bTVA4gddNQXuK3dqRDvHD7CJyMKTnGcF/Tn3ddb9/wJPh/UhFvMLxlPRkYJXzku22JA3OxmFb8ElzFhSM5z1Q5GGf31R3mYVcU+0vXl/SJafNaLhe58Xd9rTZCsWHqPGNjFp/Jl/jJq9ExqsbciEoQMUcBHAErpqftFUYyQPGsDdyIsxJY60zZX95DQxQ== X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2354; 6:uDWVcoHnCzAqc2Tdf3FaRDUmN6++hwwA+8GZNHnPvt8CfDMWXE1+FPZVJ/aCMBpcpK8IaBnMTQZ5gWpPjBIK1oCjMUXF44leW4RzMXOsK9ELpH5MrS1jLbsF6yiG5zy+3f09OgTgcY3h3F3VNEIIp9NGqg7hwcN+Q4bwq7U0r68GZXbF5c0sVdbyxEufdoeAkrvMmWYnaZBKvjOJ3RpHpBRzV6sUI4v5BeJn/zfekCvUJNd8VTtmFGaSbrxWAdWIJPBPLUdONCl61BH5FibhhwufP6+TU5KlgJKN7L9qt1p3eqQG1YB42bjtvBCGvU1gNKR8mvq86UoDH3cnd58MWHnx8oDaXGF5i06HCZ76qWQ=; 5:JT/kJY4VSmpyZxLSUxsBnpjJoCjvQha2RemL8QJy0Lbs8tpHR2N7EoKl1zhTiFjvtkLyNiZcCNjoVLM30OxFwE+FUrrYhDJ2FpuXCRgAC4jsfG4WjScxTCJsyWCMPFL907rTqbETHXrRs23tWujk9OazCCGI6hu3o+s8wZriP5s=; 24:TwMxjhU3wtevpnOkhqROunn6S4/eoCDfvT/HCGWg7/6UpiF61jfMlZh95o2ovliivbe3aZWcLoc5FSLqwNkb8MToVwVDn1rwHOpsRmj+kFI=; 7:pVo0SWmGCKg+aifzpvPpZKR+acZuELWNOceC2yMZ8zWI1S5OGDO0h/kOTS+3tvaA/uk7vSWQCWMinuPMhneMxSDYFiiei/eQHrFh0PnHsHZy3vVuf049ucfr7qjm65bJVJ5hWepLb7Vin5q0qt5ZeMFZmVRBhHdOumiuVpDuOZk+JSJRCI57buAKTGpnFqxW5XAOqkNIHK4p1xLyVCbKSStM8kSosqd/HlLCva2xfUznoKdhskDF8ysNoL+PGgVg SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2017 02:46:18.9704 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3e9e6fcd-d949-4b6f-3ccd-08d52c9c36f6 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: BN3PR03MB2354 Subject: [U-Boot] [PATCH] 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 Signed-off-by: Yangbo Lu --- board/freescale/ls1012ardb/ls1012ardb.c | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c index 41283dba42..19f0c3f941 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -128,39 +128,18 @@ 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; + char *env_hwconfig; - do_fixup_by_path(blob, esdhc0_path, "status", "okay", - sizeof("okay"), 1); + env_hwconfig = getenv("hwconfig"); - 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_f("esdhc1", env_hwconfig)) 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; }