From patchwork Fri Dec 8 07:35:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 846025 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 3ytPl84dXKz9sRg for ; Fri, 8 Dec 2017 18:54:44 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 4EBDAC21F97; Fri, 8 Dec 2017 07:54:33 +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 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 1B7EEC21F02; Fri, 8 Dec 2017 07:54:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 840C7C21ED9; Fri, 8 Dec 2017 07:54:29 +0000 (UTC) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0046.outbound.protection.outlook.com [104.47.32.46]) by lists.denx.de (Postfix) with ESMTPS id A25CFC21C4B for ; Fri, 8 Dec 2017 07:54:28 +0000 (UTC) Received: from CY4PR03CA0075.namprd03.prod.outlook.com (10.171.242.144) by CY1PR03MB2361.namprd03.prod.outlook.com (10.166.207.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.282.5; Fri, 8 Dec 2017 07:54:26 +0000 Received: from BN1BFFO11FD006.protection.gbl (2a01:111:f400:7c10::1:142) by CY4PR03CA0075.outlook.office365.com (2603:10b6:910:4d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.302.9 via Frontend Transport; Fri, 8 Dec 2017 07:54:26 +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 BN1BFFO11FD006.mail.protection.outlook.com (10.58.144.69) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.282.5 via Frontend Transport; Fri, 8 Dec 2017 07:54:23 +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 vB87sNB6018515; Fri, 8 Dec 2017 00:54:24 -0700 From: Yangbo Lu To: , York Sun Date: Fri, 8 Dec 2017 15:35:35 +0800 Message-ID: <20171208073537.6777-1-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.14.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131571932637339920; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(336005)(39380400002)(346002)(376002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189003)(199004)(47776003)(77096006)(6666003)(86362001)(8656006)(33646002)(5660300001)(498600001)(305945005)(6636002)(81156014)(8936002)(16586007)(81166006)(36756003)(68736007)(1076002)(110136005)(50226002)(8676002)(105606002)(106466001)(2906002)(97736004)(85426001)(48376002)(50466002)(51416003)(104016004)(4326008)(356003)(316002)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR03MB2361; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD006; 1:28fT9GrWG26KAR02taMljmq1O88MM8KtDksyLAZkMbt4vkSM1K8bZdxtECNFvaJIGtIFluDyB+IWk3RMJKrIX7q/4BLqrj67qD3VfOHW8gtuSZpPRJmBG2rZkgDb1R7B MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ec0a45bb-84f2-4011-a110-08d53e10e5b9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4628075)(201703131517081)(2017052603307); SRVR:CY1PR03MB2361; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2361; 3:+BRfi14llDOV82zWXRDQtc0+B9PwP7trnnieVQqtCglQLucWcWE2xNa37CfZxpvmh29mFVW2WjQi+azr0YkRe2Cc1B3LQyIwMo2hUi9Nz+mRSOb5NCNGbY3Y62281IjeREdaMn4SZ9pxlzKddMmE2uc/rxzbl0dhc2r8QkSi/zI/hGPA8E7vwrGagppmHWF6mxtMRSti8rjoKkGustgwHwI5GOycJRO/rzJdOWqi1M5+HMlKxKhpCORZl7qhSfkQpfNUIN6VIicgr0SLM8eFM3Jo1kzBONrn7AYfelxYpM6M/ofv0pyFMk9NRb8DGWmiupBnjLQ4Dzlrr55bIDinQLAEkvQEjLjw0EEd7ckIAWM=; 25:tixAvg1P8+nkmrNkpk2sSlW5kxOkGGyvCwm+KVvNGEhxetdNnxz46SG3/PyTUGocZH0kLHF/dGl9mzflpPAxEQ57y0DUa3lisx1valPeZ20H5mVBqGAs7xnj4vgG/qfR421Z56KJScRKpXAucbTaisXdfpw1rRaoKw0MXRA4m3b1HAhmLmrSLIsOSfvPsESrq93SInf+UhGWNxZAlLy7zDEscaD9MovMeoIMeaM5Xp3zoSPf/rLlRrNM/h/rPPGBzC54ZEDaz4VBSS3moCDTg0ndfqP1yIJ/Q+SbsLqibVVFe1liFfON8ErZgI1l8V2xptjkb2zjeyrnZ1ba5gvyCA== X-MS-TrafficTypeDiagnostic: CY1PR03MB2361: X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2361; 31:AVW9IpS2yVqHjhd6h1M2WzrwoLu4XhvChj2SoAGCzewLqhmxlCWEqcObPFmm9O31zLtw/4Nx+LHxiq6tDCZgifBt7bKhs9Kt0AxiakfuEvX9uWorXiViSUWK/LaitcCMTk8EpypIuoXJTPG/ZxQU14h/MlhYJxQbKLsu1GNuLvgGFcpBY13AAH7Egu5KzY2Ir/2EcoQy/s6W5FoYtRT8fuk7ANTHciPL6hRfCVMdFjU=; 4:SqXHBhbFlpi++Ru0JL0ofqj30FXqxttNAa0BxeNHAZ/uISZOMPJkAc96qn/4OHipplBJKsShOA+44mCxkIqGEIqWXoteA0cFKl5QfrGS+uzgJjwbKUDDiUCdioSpOeiSYz07qXLqmiF78Gth17/XQmAQs1tczUyFjKJsgc6FJ/aN5Z2HFQc48kxuVQeVmkdecPRemEIKYpRaAUYXfgxlZpEXzsh7H3kYvLwi06MxMltfJ6K5TpcZ71l20efZOG9Qy9PHK/lohAMhhDlJV7AS7ff1Mb5t0yC555duGpiWNJ5WNdfi8CwvcYyAzkWQPaym X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(3231022)(10201501046)(6055026)(6096035)(20161123561025)(20161123559100)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123563025)(20161123565025)(20161123556025)(201708071742011); SRVR:CY1PR03MB2361; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:CY1PR03MB2361; X-Forefront-PRVS: 0515208626 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB2361; 23:TSlBdODG0AfZFBR5LwVbTOSm2SOvwJWYvkxqWxgnA?= LmzSemgWawNEIR+dhwSVm5sdjZsZM6mq5WKh4kXVRZFZ2Uw08NkBm+brIDPNObDkIrUp5dtcs1hxYGzAPHIFhrau4CoKlRaviOdzuJY5zi9JfQmqTjMPwEdtJMgQho0e1P45T/vmgqap2haKNmswYNHOWGR+T5H2tfaCys5glEZbkwExPttFMyhGzoHJY4oWz2ebWGie2uvUwv1Fct/C+YgzxjXk971SG679nGF/x8csEl+RnLf7f49zNmDh7b0cWUrk5ese3FIjjX+pHmvBgQ3HvFVwd8zngxkq/PDK/gbwmjCmyRqACevBKPSfRVF/kSO3TNjtErbyYbpIpVLu0YRQIhS+TrRIVMU6MMQiRaaAynh1CkuQ4khw4Lxzf1b78tQ/EXykeU9vaFwB5bgdVJbi1u5L3wBbYu3gkOE/aCVC+OcV+o6HDZKt1FCrmdINswLfuWP+MczVuqJIru/yu651lWydPAFdrbrDlIfbyxB2GBNBUb3Gl6FgPUs8e/I/oDWJ+eejXZo8E8Q22VYNG4n0iGJqsMdrsc775I7FwxY+5zcDZXXcVOKPdLFadSgxUisiXuktpSh0O2BbcuqvAUj2EifgPMI6VgFN+QxLXtiABheqOzQWqwZGd0cSf6MVkmAgqneg1Dp7UzKmcHWwuHHSiEfIE1/yQm7qD/43W6yFktSX0IUf21FD/XzF0RRG87KOIQNYEtGzkfGzsQAGk2Y1bCx5llmoQlWPDd6xwBtcmJcWv78ybBI4jaPIl/DjO66swqmrxPPBlIaTBBZneLec2QRv//4LEBT+g62GLH7A+FL5Be+LaVLAVL5Dtc/5vay9p0S1EGO3ilnLlIwV7QDEkXhX32jjIaaWa0ryWNmTwaLc1s/q3Ke0359xpTe51wZZUeKVYK7BiIsqXYqulcEFkmcrG4MHRObPgjEmuaWKqaeiNh3y5L7fsP5ail/thXgPg7mq26UkZoyaXh4vTEculW4MBjHStDtnHWWJaiPGA== X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2361; 6:T+6nkNMwHgPx46xgmB9nbi7DMA011zBE5XCtpVPScxlEmYvkiwZLxarhOxgX9HvQpDu04NrMQVDLe0OiWCuioZVuUg3BYjtqHXLXoKHBw4dTs8PjalhVGjrcc3fiPMqK6jUuqo9J4Ts5j/VkH3kkZWf40ghu3pFRLqnzrv4tTE6R+tir0PaxdiKL3Q0y8V0/kQtjt0BZqMvMxSP5769T7Gbk+wDpirGtL1zLNXKWk2QKJNHghLbd0dWQ5aMNTlrhtg/vHwe7gFnziNxkpTQuQ0+J7ukSPjcJNaIGr1THfrKRKmhG4PkSO6tixHRm1clYDHjg7as39ve2qBriMCOOEp34SI1oT6Ca8Y1SoneVWRU=; 5:JweSdMd+Kxed1gAIP5clSK4jEYJJzFHjnG+Bxt4YPIpSmsePMfEAtzs3trBE+OnZpq6QK6dyZIyGW5TWkSurEb75q8B/ljK0+5S4UggBvrHVgDrOFpMd3VcWhJdt8Gr+XUcQ8uz4ABsWNJ8dEve3C9+REKgmM1ooqTzryPzG9CM=; 24:650IKXQaUJspIkl6uny+ruiZvPvUd0hR+g6NbKHfE3jBU3bEyUCXr4L91LvhqptMuD1cWoMYSuRQMnOvV5a+stfk3S6CSsBLASyrROexaIA=; 7:4v5MIz+lpYlVUrvRNLccQy6nm4zi5JdBgXvFqLnZcoE/FxwSYvlHjzDxYRKDxgk8JOO+OZxkyBvA0ElxMCtfTp+iigohipejRvtjrS9+KvbGrQOeCzjDvg/ioNGrXEaUQQOO1QLURzPAKkKBi8TyK5CkMN9yoMrkIG/9n21q9BtdECv1N7WWRe0vaOCsS2LJVEDt1GNey7+AdOMp/Dh9TzCQZSAp6aif8zi8R+0Sdmrc3k5JfdONvcNTFicq/Lgz SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2017 07:54:23.5623 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ec0a45bb-84f2-4011-a110-08d53e10e5b9 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: CY1PR03MB2361 Subject: [U-Boot] [v4 1/3] armv8: ls1012ardb: clean up definitions for I2C IO expanders 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" This patch is to clean up definitions for I2C IO expanders. The value 0x10 of __SW_BOOT_EMU is wrong. It should be 0x2. Fixed it in this patch. Signed-off-by: Yangbo Lu --- Changes for v4: - Added this patch. --- board/freescale/ls1012ardb/ls1012ardb.c | 14 +++++++------- include/configs/ls1012ardb.h | 18 ++++++++++-------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c index c6c1c71202..2f1d63742a 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -35,25 +35,25 @@ int checkboard(void) /* Initialize i2c early for Serial flash bank information */ i2c_set_bus_num(0); - if (i2c_read(I2C_MUX_IO1_ADDR, 1, 1, &in1, 1) < 0) { + if (i2c_read(I2C_MUX_IO_ADDR, I2C_MUX_IO_1, 1, &in1, 1) < 0) { printf("Error reading i2c boot information!\n"); return 0; /* Don't want to hang() on this error */ } puts("Version"); - if ((in1 & (~__SW_REV_MASK)) == __SW_REV_A) + if ((in1 & SW_REV_MASK) == SW_REV_A) puts(": RevA"); - else if ((in1 & (~__SW_REV_MASK)) == __SW_REV_B) + else if ((in1 & SW_REV_MASK) == SW_REV_B) puts(": RevB"); else puts(": unknown"); printf(", boot from QSPI"); - if ((in1 & (~__SW_BOOT_MASK)) == __SW_BOOT_EMU) + if ((in1 & SW_BOOT_MASK) == SW_BOOT_EMU) puts(": emu\n"); - else if ((in1 & (~__SW_BOOT_MASK)) == __SW_BOOT_BANK1) + else if ((in1 & SW_BOOT_MASK) == SW_BOOT_BANK1) puts(": bank1\n"); - else if ((in1 & (~__SW_BOOT_MASK)) == __SW_BOOT_BANK2) + else if ((in1 & SW_BOOT_MASK) == SW_BOOT_BANK2) puts(": bank2\n"); else puts("unknown\n"); @@ -152,7 +152,7 @@ int esdhc_status_fixup(void *blob, const char *compat) * 10 - eMMC Memory * 11 - SPI */ - if (i2c_read(I2C_MUX_IO1_ADDR, 0, 1, &io, 1) < 0) { + if (i2c_read(I2C_MUX_IO_ADDR, I2C_MUX_IO_0, 1, &io, 1) < 0) { printf("Error reading i2c boot information!\n"); return 0; /* Don't want to hang() on this error */ } diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index 794117062f..a1a563cb59 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -24,14 +24,16 @@ * I2C IO expander */ -#define I2C_MUX_IO1_ADDR 0x24 -#define __SW_BOOT_MASK 0xFC -#define __SW_BOOT_EMU 0x10 -#define __SW_BOOT_BANK1 0x00 -#define __SW_BOOT_BANK2 0x01 -#define __SW_REV_MASK 0x07 -#define __SW_REV_A 0xF8 -#define __SW_REV_B 0xF0 +#define I2C_MUX_IO_ADDR 0x24 +#define I2C_MUX_IO_0 0 +#define I2C_MUX_IO_1 1 +#define SW_BOOT_MASK 0x03 +#define SW_BOOT_EMU 0x02 +#define SW_BOOT_BANK1 0x00 +#define SW_BOOT_BANK2 0x01 +#define SW_REV_MASK 0xF8 +#define SW_REV_A 0xF8 +#define SW_REV_B 0xF0 /* MMC */ #ifdef CONFIG_MMC From patchwork Fri Dec 8 07:35:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 846026 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 3ytPlm6J38z9s71 for ; Fri, 8 Dec 2017 18:55:16 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 4E1F4C21FCD; Fri, 8 Dec 2017 07:54:51 +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 5E33EC21FBC; Fri, 8 Dec 2017 07:54:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 280F4C21F55; Fri, 8 Dec 2017 07:54:30 +0000 (UTC) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0068.outbound.protection.outlook.com [104.47.38.68]) by lists.denx.de (Postfix) with ESMTPS id 8E75DC21C4B for ; Fri, 8 Dec 2017 07:54:29 +0000 (UTC) Received: from BN6PR03CA0054.namprd03.prod.outlook.com (2603:10b6:404:4c::16) by SN2PR03MB2368.namprd03.prod.outlook.com (2603:10b6:804:e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.302.9; Fri, 8 Dec 2017 07:54:27 +0000 Received: from BL2FFO11FD024.protection.gbl (2a01:111:f400:7c09::163) by BN6PR03CA0054.outlook.office365.com (2603:10b6:404:4c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.302.9 via Frontend Transport; Fri, 8 Dec 2017 07:54:28 +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 BL2FFO11FD024.mail.protection.outlook.com (10.173.161.103) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.239.4 via Frontend Transport; Fri, 8 Dec 2017 07:54:27 +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 vB87sNB7018515; Fri, 8 Dec 2017 00:54:26 -0700 From: Yangbo Lu To: , York Sun Date: Fri, 8 Dec 2017 15:35:36 +0800 Message-ID: <20171208073537.6777-2-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171208073537.6777-1-yangbo.lu@nxp.com> References: <20171208073537.6777-1-yangbo.lu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131571932677939348; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(7966004)(336005)(346002)(376002)(39860400002)(39380400002)(2980300002)(1109001)(1110001)(339900001)(189003)(199004)(4326008)(498600001)(1076002)(53936002)(16586007)(50466002)(104016004)(110136005)(85426001)(47776003)(76176011)(36756003)(86362001)(8656006)(575784001)(51416003)(8936002)(50226002)(48376002)(106466001)(105606002)(305945005)(68736007)(2906002)(2950100002)(33646002)(81166006)(81156014)(8676002)(5660300001)(356003)(6636002)(316002)(77096006)(6666003)(97736004)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR03MB2368; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD024; 1:RGYViF3XzbCxd167qa9uvllbtabYjXbd925ClqXAHtYZ5ILOzPH+q+eK3AavsR82txVy2YxarB8sysWI3IOdCo41H/aVmRT22JYDr3Ojy84VCcURT0AIEiZIMfUN9HLH MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cf023c5d-50b9-48c1-bf33-08d53e10e822 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4628075)(201703131517081)(2017052603307); SRVR:SN2PR03MB2368; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2368; 3:qMWYpCgeTVRh5/APF+eBqMw7xVKItpujlCcfEXfF2qj7EFRrBWd1Hf1vLRshBj11sxx8lNhP+Kozx5sWkd5Fquc50gD/03yTZ6Odik1nFx778m4d5GN2KaQ1Njwzk9Mr0zNDnDc09tnvk2ZgB1PMVwN0sfy/M6FaRWNAKnvSaBuJwy6+1IygAuUURIDPEpFJoXEYMHY/m40cA2f8o135Rn56mmviLE1Cu9bQKgLADm98A507SEYEm1p5/2hMUEuFZvwWSRxUefFALhhFBtZwstxfuIy9lqKXKkYkfji3qM8mqVotAyks+pS3FnJ9ixDItSg1aNMq+2L0QF2T2mjdBSJVKOOSGxBdiM4fcEsTxA0=; 25:0sgH28isB5WLLWzbP72TZPQ9R/7CM+thffH5NpJzgofN+5SMN4bMrRcndhYB1sq87DPOYkFR/0Rj4F6H5bAdTvHAHfffJIBIjZTfrBksJnh9JSa3A/IChcQzrxAc/erOOfC1hp9DcZcoz6sjsADBmehOmhFcFL+jbgkE63k7JDpfNSYpGh2SDURQ+FiKm1U3aGKSj3m9dNTZI66ysV5y18Ee8uqILc4x0SL+XOP3mS8NScpwrzSLIc0Hi8ivIwWekFd0p1IOjgnGmeUfR4df/dp7N+bVyfx5hvsP/1QqNsCuVsM5nyiL+56z2yyCf8Cd419MwpsYOBZhibrtUAQN+g== X-MS-TrafficTypeDiagnostic: SN2PR03MB2368: X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2368; 31:BSui0Cw9CvABe9Gww4MkUwI4cB46ecSYBJSSfdHd0zTauGfYfc3LU2bEb7HfmBDUT38doCEKLTN1EB4ZVtWYBQ2OETr5ncyS9K8HcR+LhWs+yDePryZc8u3Gj7Du5pzvwNxjgstn+QzPFH4dlu8yuxf53I15Gg6GbJq34uR1gsNpem76t+49BKprni18L+aqmuShCdgCZpeltH96uM+ZWFnSvO4AbtTGrhYqKBShv10=; 4:+lgyJGKg/YwPWlyboVoym7cjSrfYxvb3KLnW1lXV0Q/KK485+ui3v2cDTYulNjpY7z03LwPc7azg8fRbtBvrgasG2RYmsfoBXSVgXw0u/U72tjFUhXzmTclxX+Tyh8IIk20ddAjmJC39OXOWuwn2uHkwnpX413hNE/MvKfIGjFazbPEA3tQmLOqAPXBcjGscyCypNKLWc5u7QM4ZbplWVQCk4y+O/8zHS2sCtdyaku5RZL3in9gqoDbarzhkLnE4YGjy1avwgOO5Me7xxPsBntCgFf0G7rEvCpse8rxIr6AG4dBHEOibIe6fk26mRcPP 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)(3231022)(3002001)(93006095)(93001095)(10201501046)(6055026)(6096035)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123556025)(20161123559100)(20161123565025)(20161123561025)(20161123563025)(201708071742011); SRVR:SN2PR03MB2368; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:SN2PR03MB2368; X-Forefront-PRVS: 0515208626 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR03MB2368; 23:2bgLdH5U0D7/+zwF/b/XDnqafWr1L/QIFNH+0NneD?= CaCZXPoWQNHslaVcpB8pHWwR9fD+sghGohBxNjou+al1l42ZFqgy6E4WxwSk0zxQXa6EKqgwouFfGDqlBmY0xqtjHzzOOwm7+23gdgk2RMsxaXu/o+mFbp01rR+UY4CE/ddU79aqSYtp7hC7/umJmZYUnGTkW5vSU6OFHmuZiQjTkEveuLUE/jF9RkYpGa3FJYS/tHOoLGuabjG8lLCCV1GBjrJ2Y+HUmiAgOeBrTZ1Vg+2bcoI4uSda7lP7k3RGqsdmLtUICnhSdEOG1IMryeAqFTMISbW2bQMuCw+S/jDENHY74ebK9EZC8WiiJxPaDrVvzVcWe+/X7TFLQ/bomg34sDC4YFTwjMBGfSRBD8dxM28pvr+f1E7uUFv3WJeSkf3NUpUwBvfwYP5v3BpRkiCnoSvI9bX+ixJ5/g2SVRzZ4Nn1jBWEu7Fox5p10p5YZ0cpxhZXbJtf9G9EqsC8SfsS8Uhcwx9zIku+/smBF6g3RdGQNkDS8CfxhcG0JvyL/z7r5IUkcWCDwemquIWjr/3SxMno9+Fq8VjmQBdIAF31ojAvmga7hUuC4F/YxFmsj2Ryurr29/9KyoDOBy1QoOvOqCimXpUWIvOXrdcOcyTo4Op+gx610Fa2vn4k6hc+jNwmrSwCFS4FjUe8GiDtiCl7Z8b/qPzhTbV91sdvjIBhE3Q7CTn6LXqM2C46sNzMX+ZsLwrLPOd/tVieU1yNTcPZXyrEbo0SGOtHJezMROVcV4gz0+gGzX9+qtdyUstC+zP/gdwdIZVHR6m7F1PQo/FZagkr30q13PZy0D/9aPpTqzJ83AEAKeREU4FZRVGnorTDYcmrZazUhd5U1yoeW0W/BVXjpapXe6kdvaoUdjA/+GU8JYOQG6KMueGh8uQeh6i46MTyxDf0HUGyLF02HnvB06l27LnDM3diOiEVg0ha9GaFZtaRmSqmLnizalb5FO5oMHAtSX7hU/Q6apANsOvabMIDn2jnwrQDkoUw1O0I/WH5I88SeCZSpg3VEaetSIQV2Ki5wn/YADGDLXeQ7r6/4DWdIdJNpSlVhk/SY71iSC08JaAlMY9PGpnuy5RiWc/dGlcO3RKsaTIP3fH3KLWvBgtgQ7t9fkEr8Zai9Ew4Q== X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2368; 6:luXDgOULSKi/QFPVrKbKFE/i5mFqHa8pJ5WWC5UJBVZ71Tg8ZZ3z50+o9AtaI5TAm+KjAhmWIViDZCmiAkAAzs+HIGhIQfdI7RHWE1JCAbCDsGvyo78BlEDGIoPx4hv+7TxLCq9+SNXxMQ0+rCXmdi48kyqeUiBFiuLTa03UCCiM/dCaqIM5N5DqKM4cd+VBxVFA1uoiTjKiYzWbKJ4CGNWZR6ML0pNqjlXOh78YBzhTjDg8UQNpM9MSvFuk7n9mi0/E+dOhAYJ/Y5pDhL2lJBOBZBhxD8nS6PLhFmDf9oUw4GahxoQDnlRRHO44MTyAHOSU4FA5oCU71nouuihSNFyKRR/29t0bi3Ht2chLoKI=; 5:8OGxm0ZpngWkj1/Dc7P+ull8W3Pjg3dl/fowRh+2UGXwcjyfDrqjvyrVuaoFJFLuj5gVKYKpf3zZHLSaV1XDmFNvZq83q7M1jhD5tQtTCmC3iZGYB+B9dIfTaKq1cVjQZciPHcI7exqbvZRSIZUTCJUCprCUnGKQKTyPW3oRhLc=; 24:k3FAGaAtBFzQ0XZKQjq75pkNMPs/de4l5Uyxk9jKOPIokXvQ0FC6IXXRcHyo5XzRgtXk8X4VgHMw/mwvlAQjblNGmJvk71cBz1/g2asfJQw=; 7:lZXT3t+MyWTnCgWs6z1EnImBoxkhlporKYs/ncrb7hUDKsWiz8Vbz92WWsjV6Ud5w8U6dwmXDugl4YrI84+yZc/Hqxx6YDFrcg3qc43+GgmtOhvetdyCHiN+00MQPOiKCYuvArBRn3ooz7MJiznZb92aWKN848zLDu/qOA4rh2RDN1Z2BLumzv3jCqodh8+8B4nUh6n16KH3lBVamT/xazxo+U7N5GnGn6UE/xeqPYMgPAy515DmaXuVHGJuLP5X SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2017 07:54:27.6223 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cf023c5d-50b9-48c1-bf33-08d53e10e822 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: SN2PR03MB2368 Subject: [U-Boot] [v4 2/3] armv8: ls1012ardb: add more board version information 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 LS1012ARDB RevC/RevC1/RevC2/RevD/RevE information and detect it when u-boot starts up. Signed-off-by: Yangbo Lu --- Changes for v4: - Added this patch. --- board/freescale/ls1012ardb/ls1012ardb.c | 26 +++++++++++++++++++++++--- include/configs/ls1012ardb.h | 5 +++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c index 2f1d63742a..421b0a7861 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -41,12 +41,32 @@ int checkboard(void) } puts("Version"); - if ((in1 & SW_REV_MASK) == SW_REV_A) + switch (in1 & SW_REV_MASK) { + case SW_REV_A: puts(": RevA"); - else if ((in1 & SW_REV_MASK) == SW_REV_B) + break; + case SW_REV_B: puts(": RevB"); - else + break; + case SW_REV_C: + puts(": RevC"); + break; + case SW_REV_C1: + puts(": RevC1"); + break; + case SW_REV_C2: + puts(": RevC2"); + break; + case SW_REV_D: + puts(": RevD"); + break; + case SW_REV_E: + puts(": RevE"); + break; + default: puts(": unknown"); + break; + } printf(", boot from QSPI"); if ((in1 & SW_BOOT_MASK) == SW_BOOT_EMU) diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index a1a563cb59..9f471663b8 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -34,6 +34,11 @@ #define SW_REV_MASK 0xF8 #define SW_REV_A 0xF8 #define SW_REV_B 0xF0 +#define SW_REV_C 0xE8 +#define SW_REV_C1 0xE0 +#define SW_REV_C2 0xD8 +#define SW_REV_D 0xD0 +#define SW_REV_E 0xC8 /* MMC */ #ifdef CONFIG_MMC From patchwork Fri Dec 8 07:35:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 846027 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 3ytPn95FcWz9s71 for ; Fri, 8 Dec 2017 18:56:29 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 46ECDC21FCD; Fri, 8 Dec 2017 07:55: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_H4, RCVD_IN_MSPIKE_WL, 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 BFF74C21FED; Fri, 8 Dec 2017 07:54:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F2767C21C4B; Fri, 8 Dec 2017 07:54:38 +0000 (UTC) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0064.outbound.protection.outlook.com [104.47.42.64]) by lists.denx.de (Postfix) with ESMTPS id 89FC1C21F88 for ; Fri, 8 Dec 2017 07:54:32 +0000 (UTC) Received: from CY4PR03CA0089.namprd03.prod.outlook.com (10.171.242.158) by BN3PR03MB2353.namprd03.prod.outlook.com (10.166.74.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.302.9; Fri, 8 Dec 2017 07:54:30 +0000 Received: from BL2FFO11FD027.protection.gbl (2a01:111:f400:7c09::122) by CY4PR03CA0089.outlook.office365.com (2603:10b6:910:4d::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.302.9 via Frontend Transport; Fri, 8 Dec 2017 07:54:30 +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 BL2FFO11FD027.mail.protection.outlook.com (10.173.161.106) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.239.4 via Frontend Transport; Fri, 8 Dec 2017 07:54:29 +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 vB87sNB8018515; Fri, 8 Dec 2017 00:54:27 -0700 From: Yangbo Lu To: , York Sun Date: Fri, 8 Dec 2017 15:35:37 +0800 Message-ID: <20171208073537.6777-3-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171208073537.6777-1-yangbo.lu@nxp.com> References: <20171208073537.6777-1-yangbo.lu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131571932699209334; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(7966004)(336005)(39380400002)(39860400002)(346002)(376002)(2980300002)(1109001)(1110001)(339900001)(189003)(199004)(51416003)(76176011)(97736004)(356003)(16586007)(104016004)(6636002)(305945005)(110136005)(36756003)(8656006)(81156014)(81166006)(8676002)(47776003)(68736007)(5660300001)(50466002)(48376002)(2906002)(1076002)(50226002)(8936002)(2950100002)(33646002)(86362001)(575784001)(105606002)(106466001)(498600001)(85426001)(4326008)(77096006)(6666003)(316002)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR03MB2353; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD027; 1:KxrKsJzdMQKQ78opwPXSG3RmMYVY6Ggc2UP58XXzv3qgHCYjb7PimObYKZBkchW/rSpIFRv2YrhAEjLlw5irwcXSG2Kmxyd5C3bQHqJX0N9H5ADzbOw4vb5oZEeRoepD MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 017cf756-8050-42aa-ae76-08d53e10e969 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4628075)(201703131517081)(2017052603307); SRVR:BN3PR03MB2353; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2353; 3:OklRvXSvOrMXb02bo3P2xVfpSTiVUTLlKXzd81XFHrhT7NyKqaOlVPmgMJVkrkbVj/4dYR7/FeBW5X2E8DSZK3LGkwafpSwivP6JEE2doQ+gGkCCEs+tL3erECN/c3XujyQdPC57Xqv1NwfAx9JpRLJEHJYITjL05vT1a59viEky70j43S6KGYZ2NSn02CNbbildWIE/dHb+b66TV+ZUojtuaienadwsAQNXyzadInhby4frCHze+b2IvI6in+aZ01qVamp9vkMJ/uBN2yApbvfAuZI8dhXLIrToXtlALS5v5lmeTn4jp8/4gN3h2IKRctI3w8PcHqNwjIPH0WqKACQ0MPoZHHZvFjMPIj+omMo=; 25:PzujV2REEAU2hmVp8bbbWEW/jvEPbmiDfhP4WMCbW/hr8Nd9QtyW7pRcTU/Fh84MaoG5+/auM0k8dNk/2RyYSKE02tks4gEr03URoCitRe9mCnhiVPV1jH8AZTUdxOlkdgUIL0WixcAZCMhw6kN02Qf+7rUT4YKH+k3+dw6JDm5DvX87RTqwl48awz28MkF1u3Xx2w8DA8C69ybNmmu2YyfQAFCD5HEZsFAVVf1moHdTQEh1qkiIr3H/QYbbiClPbYKlcINMbyS7tV2MU7p+PNmTHSPSMWKXbUMLZ6gcU/KCliJHifCrfiWwaph7LJwEmduq3xb8HrEdohqeE/DTJg== X-MS-TrafficTypeDiagnostic: BN3PR03MB2353: X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2353; 31:PAP3wKgYVVHCIAUhMMsAUn2+9PNMgm7oE4Kcf1YqCKcTMFWCyFX1hD4nI/BixbAWk/1ywfAcSI4gG9ujuocgfOsOOry6352M8HcbSuN7PqfbqhvICy2/8mQ/kxTP2SMXqxrOP2dia5qGAqQm55BFRok4jewwC1pS8k+ZSV3z4ZVNXewowZaVIFgSJtmj6+mjeio3eN/s3ZOmZSKAufhwkKacOOx6rFcZWIafJ7KRoL0=; 4:qkEDHEynmJ6GkhXJZTFdp3kGXDuO1wL76OzxGz+iNbL4rAIteDToZrjXW6SegvGujmq4sJOno+za+7OTXSv+0+TlIhJpF22C5Whv7/wp3ZIWNV5pt01V9lsBmHEIis4l0STjXjU0Eom+AIlkSDv5VT7jCtkaQolJRoT7Jp7t1eytJE6pK5seoD074ATjc7AIXLnjqzklhVt4jYq9uwgMTJsvJ0CdWq9SwQdhgUXa4Uf31jMh+kDZYcA5q05UWeMbDTD+sp9Q17hy5G7Bd0Pgv/ZYAEv8EzblVMMk8xy4yXG8o05zHv8kECh5Ik3hr2+9 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(3231022)(10201501046)(93006095)(93001095)(3002001)(6055026)(6096035)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123559100)(20161123565025)(20161123556025)(20161123561025)(20161123563025)(201708071742011); SRVR:BN3PR03MB2353; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:BN3PR03MB2353; X-Forefront-PRVS: 0515208626 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB2353; 23:Cfwsw4Shty9Ouupf1ummskL6G/NvxlQTBbGwGKcU2?= mJwIA68aJxhu6N658P25hpdSkVZ7TnKdqiiFYtAQZ9zKW6ZeuDPwMRNa0ISApSvnmE/fIhVhj8V6vh53QViu4wmsX7NZR6ZP2fGh3crpQH0215TO4QpSw2oJ2cgXGWM23dgcagbh91VhO2B92Yn5TFRZJOqGcpCloDX13MsoGrk+qWiMViBVN2Y60PtlPuKMhcNWklUqvc7hbhqtYY+GbPDZ4MkmGTF/nURmvDvnRKJtuZ20rHlde4RdeEJ7AVLF7tm1Ks624uxcD6Udps29T3y2kBEOGGfYsGEtpH/aDHdP9TrdeqQKUsx/XnHnysOzqehcOasCQB5z61eHPsa93wQyCmkUpr1nlYJbQDYkrGbsgAi3crrDUwxpPms5V2ldclg4SXBLTSM+AFmW+r8JxapfHz8/WMMngjBjIaNV/iZOWRR9UKuChAU7zFkXlVbTh7GVCR2DuFjF5SBikLH7jh09+M33jUOhlxsMmQABbOHyzC5JGmpa+domnNaKDKOEcZXCsEdoBfzlpHj8QKWkpwOFGilbWYCaxk3+vP9P3uxkcKawiFXAdVXKQqqgXa0Yz2xB6+KNecbQlFWFkGd7eaXYhty1pAlBFdW/fqa+/4eZVv8i/UFHntPSDpE2kHFJysv85rCLY6m3r6eLfqlsH3MRC2hXOk0rhApoMhE9dAR6Ac3ouaTOy9u4sWpMVtIaDsWcduuxA2aScrPwj2c6nxccOjCPfNLk+ZIacS/Yyqp04th+PVTVJtDQzupt9AQp4+U/6PYIy1ayFf8l4anW87GGDKhzwSXJnNEny0BT8Jz8y5eLaeIoFJNDaGR/8xAdE4r/5+k6tYGzJ95SBlkojPKvKL1gNvNmqk2hJbSNFrjBHjUvzfc/ukKyHBcvT5U2cvbBYvB5EAkuEze4uzG23gLV9kJsCroRhlRgsYcYhfTLnAX/gLFMrzRq55waPjuXFa3gkjGchWcrN/oPCLkCiNa80ZpIYqJ37qzrgJzhxQo9mbfGP1RjjCHaFvvt/gxJDAPGJR26cL1+NwAErQSLn+XwmqiSrEHOjSGVWJcVE+vJgv+Wbs6M4FfJyr41us3icMb2LjMvZ+BtTpXJI1tmqQq X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2353; 6:jflq4wH0MWQppXwJgHgabPlj9+egG8nYd6Tb3SyJ9NL/ID9tWLcAPzSAoqHnQPwozeLpz0WVIJMz2fB+IcjkO4vIdqzheRMRhge5jLmqFeTmREBOkVtfDSQY7jIE88h4WWDu+wHfLrSEr8rRRxOy60pSm33XWZyzD5icucT3Ez6Hced5Utf2VcYxrOXuVvG/aNrqIE2OSHc2YBqZrcnVrGAL/pEZTuA/QPkQufBVSe7RxFZlr/VBKR8q2SbyTAXBgpbl0ABdj/KHQmlLfkr5o8PSvOC3lgD2ViqTx1on3GfvHXB1a9M9fO+tff7COSgGnhR8D0dGNBL3ef9pJgZWlDiNXC/LeCyEc/PQgWjTB0c=; 5:hS6hi9uxkndLTYWpYGd7uN3YiMmAV6MY5sBf47Og64+azEgDIdhtQTOd+96/HXQqieZpNqiqSRNI+aWpdhIEW6hnV77aVaO9U98C+xEqpEqYCGjDEBsmLGCq79DD28EtcVz5ARBNCoolpuVJ33fzgzGz/aFtZ0+wzqGQVQzrcg8=; 24:VpHo97KClH+/xCNV2ueNxpCHYEQtQjK6ocTkvBG08Oinfy2JtqRJMxHpdu7e7cs4xpW/QtM4vUprtdoYA38YMygYbNc+HDU8SsngzMcICOM=; 7:giSv3rNc9Qy6HTM+dQYgvRpSdZh5/9P/QflaJB3BAV1IaRCPUw5+snqQpyTbxINcBpsjFjJFJ94HR6RXAzQZiIBBXHfQK+1TicvoNrkyHlGz8j8OxcRbin/Phj6SazrSTZHLdV0vry/uGtitVu8Sp0US5iCqN3O/Atzq58o4kS3ulIeEF0R/uRSlAZcW9W54uECBe/AstvxTTymBX+5gDPewXJrUs/TVgoOiL+cOp7yHVneALnsl9qCW/RhwwlIM SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2017 07:54:29.7493 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 017cf756-8050-42aa-ae76-08d53e10e969 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: BN3PR03MB2353 Subject: [U-Boot] [v4 3/3] armv8: ls1012ardb: support hwconfig for eSDHC1 enabling 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" I2C reading for DIP switch setting is not reliable for LS1012ARDB RevD and later versions. This patch is to add hwconfig support to enable/disable eSDHC1 manually for these boards. Also drop 'status' fix-up for eSDHC0 and leave it as it is. It shouldn't always be fixed up with 'okay'. Signed-off-by: Yangbo Lu --- Changes for v2: - Just used hwconfig() instead of getenv() and hwconfig_f(). Changes for v3: - only applied hwconfig support for RevD and later versions. Changes for v4: - Modified commit message. - reused io variable. - checked CONFIG_HWCONFIG before use it. --- board/freescale/ls1012ardb/ls1012ardb.c | 55 +++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c index 421b0a7861..286f9d8199 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -152,34 +152,49 @@ 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; + bool sdhc2_en = false; u8 mux_sdhc2; - - do_fixup_by_path(blob, esdhc0_path, "status", "okay", - sizeof("okay"), 1); + u8 io = 0; 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_IO_ADDR, I2C_MUX_IO_0, 1, &io, 1) < 0) { + /* IO1[7:3] is the field of board revision info. */ + if (i2c_read(I2C_MUX_IO_ADDR, I2C_MUX_IO_1, 1, &io, 1) < 0) { printf("Error reading i2c boot information!\n"); - return 0; /* Don't want to hang() on this error */ + return 0; + } + + /* hwconfig method is used for RevD and later versions. */ + if ((io & SW_REV_MASK) <= SW_REV_D) { +#ifdef CONFIG_HWCONFIG + if (hwconfig("esdhc1")) + sdhc2_en = true; +#endif + } else { + /* + * The I2C IO-expander for mux select is used to control + * the muxing of various onboard interfaces. + * + * IO0[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_IO_ADDR, I2C_MUX_IO_0, 1, &io, 1) < 0) { + printf("Error reading i2c boot information!\n"); + return 0; + } + + mux_sdhc2 = (io & 0x0c) >> 2; + /* Enable SDHC2 only when use SDIO wifi and eMMC */ + if (mux_sdhc2 == 2 || mux_sdhc2 == 0) + sdhc2_en = true; } - mux_sdhc2 = (io & 0x0c) >> 2; - /* Enable SDHC2 only when use SDIO wifi and eMMC */ - if (mux_sdhc2 == 2 || mux_sdhc2 == 0) + if (sdhc2_en) do_fixup_by_path(blob, esdhc1_path, "status", "okay", sizeof("okay"), 1); else