From patchwork Sat Aug 17 01:07:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pankaj Bansal X-Patchwork-Id: 1148564 X-Patchwork-Delegate: priyanka.jain@nxp.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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="CF80s+xR"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 469MVr4bCmz9sDQ for ; Sat, 17 Aug 2019 11:07:45 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 92FAEC21DD9; Sat, 17 Aug 2019 01:07:37 +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=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 7C04EC21C29; Sat, 17 Aug 2019 01:07:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 031B4C21C29; Sat, 17 Aug 2019 01:07:33 +0000 (UTC) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140073.outbound.protection.outlook.com [40.107.14.73]) by lists.denx.de (Postfix) with ESMTPS id 8C9CCC21BE5 for ; Sat, 17 Aug 2019 01:07:33 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FsB1GDzwKy9TO7hxR5PzjDlXwdqOfob6owMYPzGzOXnLy6MNsg31YvoQvZm65TncupEqndwT1Gyb9QcYQ7eUhESxk6hDfDLglq7pR7jup2TalU/xddAjdOUGHaAfBVQgji9FySHLNIgmQiwSbtM9odPJevSFzoB4bdc+3j/bT1xyu7ULXGHxrd6vtioZ1BkiEflSzxghwhxQyZDh+FQTo0/mZ3BY5axOjKrHLtkAv563bdXzsIFMFXzjDXM8FXzBuudlXsD70tiqGErihmJJ5LRtZkZ3VjrG2DAoEj0oS/GUGli9POwG9f/I3WE+kDDraT+TEFA6TSTvEOVG9PZMDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Irx7x+gCJYNIMzcTODOMcXQmIQ9lTwuyoUVOTVrp5Aw=; b=eB71KiSjWcdG6lv2GiT15x3OtaNFVdGKbcgwSng8kFT1lOprY2mhFRvqv8MNrdWcC+pkhZOum/adYly7Hxd7XgPjUY2I06Q0PQnF4afpv1QmiSA5Ntg+wNr5mnfI+yXTSe6BBwpTYtpcqowI4uAv6zytTfRpcYerYnU9LwxiCUli4Ko+9YZJ11ZQuZeNYk1no5q1VBJzl84WNJh8UtWadskPXdS/RfdcVT1qonuleXODqrL/R+fuyudAM0D1Tf8FMdT9DCxvumfIvmiSHcNZ49nfSPf84ZwYvUaCHcDK3Y31xLxwLFW4PvXfTjA1XJYrad4KogublqYjYF5f1FXXdA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Irx7x+gCJYNIMzcTODOMcXQmIQ9lTwuyoUVOTVrp5Aw=; b=CF80s+xR1UOoE5wErGPBIjN8jvSm0KXhYneWg3bN3Rgnf13wov837X5VRhZdwlOv0C44Ay7o6d2MrL8VLZjnT8SMezw+5Hh6nRMF9LvuxQFa7gfMznCuNY/T0VJtrALUAEy4TDjdZXqGw6T9GxWcisVJQFNgC6DGIxsTuaJvBvU= Received: from VI1PR0401MB2496.eurprd04.prod.outlook.com (10.168.65.10) by VI1PR0401MB2288.eurprd04.prod.outlook.com (10.169.133.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.18; Sat, 17 Aug 2019 01:07:32 +0000 Received: from VI1PR0401MB2496.eurprd04.prod.outlook.com ([fe80::d805:690a:9e8a:9a74]) by VI1PR0401MB2496.eurprd04.prod.outlook.com ([fe80::d805:690a:9e8a:9a74%12]) with mapi id 15.20.2157.022; Sat, 17 Aug 2019 01:07:32 +0000 From: Pankaj Bansal To: Prabhakar Kushwaha , Meenakshi Aggarwal Thread-Topic: [PATCH v3] board: fsl: lx2160a: implement board_fix_fdt Thread-Index: AQHVVJglM1BuD9Oc40S5lwZYULHcRg== Date: Sat, 17 Aug 2019 01:07:32 +0000 Message-ID: <20190817062954.12952-1-pankaj.bansal@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MN2PR12CA0031.namprd12.prod.outlook.com (2603:10b6:208:a8::44) To VI1PR0401MB2496.eurprd04.prod.outlook.com (2603:10a6:800:56::10) x-mailer: git-send-email 2.17.1 authentication-results: spf=none (sender IP is ) smtp.mailfrom=pankaj.bansal@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [92.120.1.69] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8e05680c-2c5d-491d-81f0-08d722af47f9 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:VI1PR0401MB2288; x-ms-traffictypediagnostic: VI1PR0401MB2288: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:9508; x-forefront-prvs: 0132C558ED x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(136003)(346002)(396003)(366004)(376002)(39860400002)(199004)(189003)(102836004)(186003)(81166006)(6506007)(36756003)(4326008)(66476007)(26005)(66446008)(6116002)(53936002)(476003)(316002)(64756008)(305945005)(66556008)(7736002)(478600001)(486006)(52116002)(66066001)(6636002)(99286004)(44832011)(14454004)(8936002)(25786009)(2616005)(386003)(5660300002)(256004)(50226002)(81156014)(14444005)(6486002)(71200400001)(110136005)(6436002)(54906003)(3846002)(71190400001)(6512007)(1076003)(66946007)(86362001)(2906002)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0401MB2288; H:VI1PR0401MB2496.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: O/oLNwF8Ab+gxkRrT8dfImyLOby+001fYUOmS1jhW4Pqo3F2EpTbVejir0TGG+G60kfaCzmvZhf4SZOKXDCx6QeAwa3OKhD/nBYex/UjZkHgS7gmAbMaydWCBI+w9HNc7Ya/nmGeWsFxtRcPl3mKZNtgIGjDBQx4P7cr4DmRQ4fVKEiTy0Io2DHPAdAqkH392bnFHBx/O338SgBQkUi6IYJaAPnaJ2JRtIxAaeJJEjk9c6gCeUHwgYMn0FJYsCA7hi4sDq/PO6aInKonPv60cE+2ZAf+qE43Hub4Nhv4NOmbtKEsbs97lK087omFVcyr4wu6ohk9hSBTj+XvR+YxYngaimZOt99py9Q3AfSlGzrOlf7SGNrD+7cd2qnhAH5h4R2eKoI5Qnn/iDJR7crpziXGi81cFsPgD0GurD4dPeo= Content-ID: <2B4B4BD73FFCB044A044F405C81D8A23@eurprd04.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e05680c-2c5d-491d-81f0-08d722af47f9 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Aug 2019 01:07:32.2368 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: sQzt+F8Erhgt/f4m5Q4eZZGj2tw/e1tsSA3NHbCkF7G9hZHdHvK+GmXxNHB9F7dqvpgAQlb+eVXqc3vEKebWIQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2288 Cc: "u-boot@lists.denx.de" , Varun Sethi Subject: [U-Boot] [PATCH v3] board: fsl: lx2160a: implement board_fix_fdt 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" In lx2160a rev2 the pcie controller has been changed. Therefore, we need to change the device tree nodes of pcie controllers so that new controller can be probed. It involves changing the "compatible" field as well as registers names'. we are keeping same device tree for lx2160a rev1 and rev2, therefore we change the device tree nodes as part of fdt fixups. These changes would only be applied if the soc revision is not rev1. Signed-off-by: Pankaj Bansal --- Notes: V3: -Fix the compilation warning "assignment discards ‘const’ qualifier" V2: -explained the patch requirements and patch changes. board/freescale/lx2160a/lx2160a.c | 68 +++++++++++++++++++++++++++++ configs/lx2160aqds_tfa_defconfig | 1 + configs/lx2160ardb_tfa_defconfig | 1 + 3 files changed, 70 insertions(+) diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index f3885fa8b7..071b45662e 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -20,6 +20,8 @@ #include #include #include +#include +#include #include #include #include "../common/qixis.h" @@ -108,6 +110,72 @@ int board_early_init_f(void) return 0; } +#ifdef CONFIG_OF_BOARD_FIXUP +int board_fix_fdt(void *fdt) +{ + char *reg_names, *reg_name; + int names_len, old_name_len, new_name_len, remaining_names_len; + struct str_map { + char *old_str; + char *new_str; + } reg_names_map[] = { + { "ccsr", "dip" }, + { "pf_ctrl", "ctrl" } + }; + int off = -1, i; + + if (IS_SVR_REV(get_svr(), 1, 0)) + return 0; + + off = fdt_node_offset_by_compatible(fdt, -1, "fsl,lx2160a-pcie"); + while (off != -FDT_ERR_NOTFOUND) { + fdt_setprop(fdt, off, "compatible", "fsl,ls-pcie", + strlen("fsl,ls-pcie") + 1); + + reg_names = (char *)fdt_getprop(fdt, off, "reg-names", + &names_len); + if (!reg_names) + continue; + + reg_name = reg_names; + remaining_names_len = names_len - (reg_name - reg_names); + for (i = 0; (i < ARRAY_SIZE(reg_names_map)) && names_len; i++) { + old_name_len = strlen(reg_names_map[i].old_str); + new_name_len = strlen(reg_names_map[i].new_str); + if (memcmp(reg_name, reg_names_map[i].old_str, + old_name_len) == 0) { + /* first only leave required bytes for new_str + * and copy rest of the string after it + */ + memcpy(reg_name + new_name_len, + reg_name + old_name_len, + remaining_names_len - old_name_len); + /* Now copy new_str */ + memcpy(reg_name, reg_names_map[i].new_str, + new_name_len); + names_len -= old_name_len; + names_len += new_name_len; + } + + reg_name = memchr(reg_name, '\0', remaining_names_len); + if (!reg_name) + break; + + reg_name += 1; + + remaining_names_len = names_len - + (reg_name - reg_names); + } + + fdt_setprop(fdt, off, "reg-names", reg_names, names_len); + off = fdt_node_offset_by_compatible(fdt, off, + "fsl,lx2160a-pcie"); + } + + return 0; +} +#endif + #if defined(CONFIG_TARGET_LX2160AQDS) void esdhc_dspi_status_fixup(void *blob) { diff --git a/configs/lx2160aqds_tfa_defconfig b/configs/lx2160aqds_tfa_defconfig index caa411fad0..f98c86d3f4 100644 --- a/configs/lx2160aqds_tfa_defconfig +++ b/configs/lx2160aqds_tfa_defconfig @@ -9,6 +9,7 @@ CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y CONFIG_AHCI=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y +CONFIG_OF_BOARD_FIXUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTARGS=y diff --git a/configs/lx2160ardb_tfa_defconfig b/configs/lx2160ardb_tfa_defconfig index 2639f7683c..585a689917 100644 --- a/configs/lx2160ardb_tfa_defconfig +++ b/configs/lx2160ardb_tfa_defconfig @@ -10,6 +10,7 @@ CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y CONFIG_AHCI=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y +CONFIG_OF_BOARD_FIXUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTARGS=y