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