From patchwork Mon Feb 14 12:55:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1592494 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=QMYsjnrI; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jy38s0051z9s5B for ; Mon, 14 Feb 2022 23:15:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B280483BF4; Mon, 14 Feb 2022 13:15:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="QMYsjnrI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9CDD9838C7; Mon, 14 Feb 2022 13:15:47 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03on061d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0a::61d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 10DB583B71 for ; Mon, 14 Feb 2022 13:15:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z7HW4UG2tE1835CQN6mk7GP6gCkfrtP+poU52nqKEderJJUkmY4/EfrlorSOlX63AiF0G7gymoJeW2BGd0XysbaJ1bdaflNlRCEQXEYPTpOEqiHNJou40Aua/RcaZ4Fen721fxSMWYofrtIL8jC+CqKaikG1OHTeSBVnrybYZucT21uznaQj/I2GptPXxvMsR9IIzzMiiSg6JrRKlpbqTj8xqiCwpn/3/efLeNIj+DU5eR/6AonZxNKong8MUdSMASM1qi2Nyb6MBC+2xI4mkVlctkzaL1NqVeW/U3OqX9f5+r5BSjIPVVxHgcIjUPKnwnJnckAV/bnCRxhmx4Fbww== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1JS8viqNf0MwZ3R1LbP83Zu6v0bJWpj/U2pX8VSKUVI=; b=DJLvEJ4/qpFC1d0WwyzqhJKOvJi+FhbzDcfhoGTzg4m8URLyiLSqSAgmTkMHIT7HnyvLDpsHk9voN1MeRXKSxl5MMbXLCm53rWslkI2tjgVGiWYZ4Duxjg9YHMUNuwwSC0yJE0BpnB37XjUJQl/evaiyAglwY/6HyX/oFnvOeWbIWXLaKZXNuiakhrMbP3BDMlpvOPUd01XRAv7xfjxpxu1qEwgPbawQRbRK/3SGcgW8d9f/sud1ncUZ+iN6BCOPsjNlafavvYI+ROxBu4bvg+Fiol5dr9TlCS14Db7abzFNRvc9xqHQowErZl6XEyPW/XdQuD4xLNAsHQC16uP7cg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1JS8viqNf0MwZ3R1LbP83Zu6v0bJWpj/U2pX8VSKUVI=; b=QMYsjnrIZeAqQxklwNu7ngR+CV/YH7xwyNBI3cCVdRk1uMjKdK57uWsNk4vfvemHLlEGJD/YvAx3kCAZF7LVK9SHHuxccbH/7yKWGl7p2Q4C2TsVnXrrgJjHrs9htwO2O4pbOkwe6bhoTDjU46kyf5lmM4SCNXDfpdn86PnRgy8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by DBBPR04MB7690.eurprd04.prod.outlook.com (2603:10a6:10:200::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Mon, 14 Feb 2022 12:15:42 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::448c:19d:ca9a:123e]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::448c:19d:ca9a:123e%7]) with mapi id 15.20.4975.018; Mon, 14 Feb 2022 12:15:42 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de Cc: festevam@gmail.com, u-boot@lists.denx.de, uboot-imx@nxp.com, Peng Fan Subject: [PATCH 1/4] imx: imx8mp: detect i.MX8MP UltraLite when get cpu rev Date: Mon, 14 Feb 2022 20:55:22 +0800 Message-Id: <20220214125525.26954-1-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.30.0 X-ClientProxiedBy: SI2PR01CA0018.apcprd01.prod.exchangelabs.com (2603:1096:4:191::7) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: af4fbcce-d353-4f17-e6dd-08d9efb3b85a X-MS-TrafficTypeDiagnostic: DBBPR04MB7690:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:820; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ak7zSm4ILiH9LFyfRa5ZAfJWVA25VEX7Sm4CdZaHZRBLNq1mNllqPqiJos4slJYQyHAjmtgeZLBuU2umWh4i62VISChsjTmgJVPFVjl4Du/ksGnafqU2o2vV1PsFH7G31NGeLj4dJx7fGksaMyWWNzNq3bZ+am11a+pKQla19D0shRVAGq4+y6SqccK8R1lZqJodsR2zd1kkdGw+dxT6QrKMozjREOOzo8FyxuA+OmFSdXS9hZ4bVLRTv05JYiVIaotM0dJHtCSsoMXjeBjxTcmFwx3xf6AIFLQRrjeksK4GiMdDNr5PHuqmEEYXDzukElfVDSPQp5F1MFYCaXW1GP3+lJyUuxL5nO8W3A6SLGdSsk5K/hpHOea3rfYqljpXAHIzQetOavz+iYUKkP/SfARwBtFIj2cmviR9AdjTdVNc0+s8IbYQ7jFWd8r0SmTEDJ+eF/Z/wZIprQEiSuq3ag9jWFjU9GjwlDgJsX1+ivezuuCn19GNeHKERFbN0V1LcZ/THzevGmjcVuDUuGjrnk5FJQCjLV3mL9iZDtXTnmWVNn/X/RJ4Ks2IZmoWTh1ZZ4YJ6hU/5sITFFHSLcdZALCWyslczCUQQWn7N2xitVRDu4zuF5jI5HW5JvwYxhTz9h/BqNbkay8euDFo86MIDB/MjC6ol4OCa5oNTtVBfatenqXejls8biwGi7B2uX2MoLcIaqwfpHY2VkEZMm23MDVU8xiWGxLsAgRZQ8XD4QY= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(4326008)(4744005)(8936002)(6506007)(5660300002)(8676002)(6666004)(6916009)(316002)(83380400001)(52116002)(6512007)(508600001)(2906002)(2616005)(38350700002)(1076003)(26005)(66946007)(86362001)(186003)(66476007)(66556008)(6486002)(38100700002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0Y3TSlK76+GtctUhLXiozxZGUdYSQGxD/p+rzYR+qo1AZ24cHsHcIasjOD2IFyetylx5XHmHa0eUDIfLznWqbpF3TG2qBig2WE0ABby4TSau4Kxs6UXmEyLPwfvFWbwLdcupOXLExft8cr16DDUD3EczI5ruEivGaC5ljoiYA3qM8sgRfli31jO4m7O5jFurGpMILcNZ/A69BJjTnaiQI4m0To/BOX1oU2XhdQKSf6Kcr0F0GyCTNk0ZfLvLTvhMRGzUQm1cyqsWSi8EAVUAyTB0qE7VO2FxQ9GccH9giUXxBge/ba9l+wfy1vhqEYRANNBwc1H3njEM1GqDGAerJgDusr8lNcqTXTkfE0p/Vi/2ay1nDP1zUElr8aji//k/8rb8j8TWo6QqOPx5oV7+RDZYaucP3dWuGUBymS98WeSoggjVQFB9jiYL62TjdtVBgHka6leFlm/AOIwCMBTUaqPgsKQEjwzl0BO84LruV1QuXYpnh7fTicqhgEy6kOg5pZObNDsscOkQ5umbn35/UG+r5vcUV39oz1Kb5Cvtq/WLA3HfHSQtAekwM1YGD8TYsjv9Sl//UZ4ViZeZ+3xtDz7Rx+n3VgaZ+QO7Tmuo+zGJmuKLPzewVhstixJIlwaIDBhIl3JzedrhgXHGpr8FfEZJJREg4ohFf4JSXOIpytaRAhfNgiqLSTtrtysDfSAqNx48o04ezsVSGD7nXtNGgPPd2WZMKhRyQnqXGh9wJMAw/19R70+wSUiCi+xZI1teCoyvz4bwcOXM43iBXtomEkLAEnS5KZrwzU8Ep+D84NHkOb9Nzsyd9SfKXZD2G0kS06PQp+CBZBYcuGn5l1Sap26T1ofpm5CJE1G4cAUpiBAfdyKlXI74pIAn3cgp6edui3+7ZkdZgRRAe5Dq+XombVGpoGCjvB7NV1IXmlc5zj9Au/o+Wk9lFeDe1IwhbG2T+A9feQA7LIQcAe3NsWA1FzonbU1Lu66IhsOOEcpv4rMHJ9R78zB7kanYKsyZivJ6AkeUIgO8MI1l07q3g4imZfYhykAsNlxz1sai2Gv3whW+S+kCFTjk0iweF+d9hriu1ezXhBpt3Oq6iKEjtFRZxKHOH57YT5TtiJOgB7i6qYg930m6TQ3DEU4Bg9TmDfztiIFmC0DkCJDfy1eu7xy8vRwfJ4dKEr8Lyj+psJJCezLjplH8y3lIKakzy7aMgHtLaEEZMXusuJjJ9w53aITl1r9WHk0mRrvgWtTOBkPWb9D/vDjOGkeYU1HdrJDfMJZ8ninw9iUrFyfvs9YkIs72tgA+teJNvSVh/LpZ2zJyJgdOYZ1dHryiEDZRPk1BgVq5l4RSqXSQltItPYeL95cwOL5vZvPm6gIzVuxtCvVkIsR8t1LtnCSr3L7PRHeJ8rJkNNnQLR29LXp6Frh9yImNff6JLc51VoqvTBO20aW7DPCjKqrsd36eCxpRm9MAO4YPBCP1QYsjg1p0c66rzISbSvQEvkjjh3nn/yyzvwxxtcfI/IedeySAC4vcqhOw7imdmPM6FTCs3+jN7xdMWYcln04Y6KBTVpbgMO7VGZn0dAjn5Vrh188fMFIzGD3G28EQUYYEmuhEwG7Dja1ffyFKpy9jkmx8/3SKq2M2hAKN9Ew= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: af4fbcce-d353-4f17-e6dd-08d9efb3b85a X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 12:15:42.3776 (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: 62AYQzH+74NYZy0VW2dmkfrESaUgTH+gw2WNC3DJqdq75piVNHq2TkjOWPBTPuhkK6BVOEFZGeCxjCXeM/XkkQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7690 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan Detect i.MX8MP UltraLite in get_cpu_variant_type Signed-off-by: Peng Fan --- arch/arm/mach-imx/imx8m/soc.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index da106769b1..e2d21bf6b8 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -407,13 +407,27 @@ static u32 get_cpu_variant_type(u32 type) /* npu disabled*/ if ((value & 0x8) == 0x8) - flag |= (1 << 1); + flag |= BIT(1); /* isp disabled */ if ((value & 0x3) == 0x3) - flag |= (1 << 2); + flag |= BIT(2); + + /* gpu disabled */ + if ((value & 0xc0) == 0xc0) + flag |= BIT(3); + + /* lvds disabled */ + if ((value & 0x180000) == 0x180000) + flag |= BIT(4); + + /* mipi dsi disabled */ + if ((value & 0x60000) == 0x60000) + flag |= BIT(5); switch (flag) { + case 0x3f: + return MXC_CPU_IMX8MPUL; case 7: return MXC_CPU_IMX8MPL; case 2: From patchwork Mon Feb 14 12:55:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1592495 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=MPcAVPVn; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jy39459w4z9s5B for ; Mon, 14 Feb 2022 23:16:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A71C083C14; Mon, 14 Feb 2022 13:15:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="MPcAVPVn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 29F7983BF9; Mon, 14 Feb 2022 13:15:53 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03on0605.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0a::605]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1321783BAA for ; Mon, 14 Feb 2022 13:15:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nxCDbN0es9rG8hc8nVL6V5YOGuQQIuwSmpil0Vhbpxtx4Nar52BSVn+RbctDCB4gk8KzaWinPoEwG1jfi2DbfdxYi90dsZs4O16pRA/0vO//1rWybfRhOKI5byqoWETOs+OmkFSCGaKmtiM+4pr0YHhOyrg49wuO8nQRUyiH5W3GYdxPsbQEdggCsFc+Nzv0rLdEzpdnuvjXfis3HSOo0KJJEiDi75a08yDnjiZTY6XlBMrimpWQGcxRJ+3TL+UwZ3QUePT6sJxxlZx2A6jpph2+Ot7ciU7Keal29PyuaCYf/OonJCsSOu7n3MBW56y/1wYPlA1tBt/RWw9+DRCISQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tQsC7ZKCy7FDAnKCORi95+Gt3wuu9S/Y4hXIHC4yi2E=; b=N0GBZcKLhS5On/xmPNv4U7tXFcON6Mxw6SiIDiDVyMBo4ZEhUA5cJgUsztXKEWJOU9XiqjiwKK+5BpRq5HDj3ah71pnbr4/cAvbDUNNG5ozZHCgvoiLgTKrdyBxfl2oLUjPzFQVc5AEuo7Hftc/oGhSxaBKNs7wFaJJI9PqALaItIl/kWorbgRgcHLn5ZNW0260oKXbZhgd5jxwP+1JpTHjDfGBZ9n/ePsA1x6D1mrHcPpxS27MS2hyj2b8xCmTeuVMpe0Qswf5HAqdTI6V23cXU2OSi+cOoD9LFQLaPaQvlv3K+RM/PE1gz83tvvydShQ4rr5Iz4lm8dxR8u2NV4Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tQsC7ZKCy7FDAnKCORi95+Gt3wuu9S/Y4hXIHC4yi2E=; b=MPcAVPVnDlQGn512fZVZ7GV+J6CErMIgXsE1WZ1WtWkqYFIagIcyEjYJZEbLaG7Wt+GfkDZgBsWFFDEjoBeIYVz7urL4zMdWTB+ZBJMnlLLenj/cMqGijnupjsH8qAb3FeNiP980NyrgPYX9SiWpycJOKyd39HN4EGZutKJz87U= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by DBBPR04MB7690.eurprd04.prod.outlook.com (2603:10a6:10:200::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Mon, 14 Feb 2022 12:15:45 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::448c:19d:ca9a:123e]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::448c:19d:ca9a:123e%7]) with mapi id 15.20.4975.018; Mon, 14 Feb 2022 12:15:45 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de Cc: festevam@gmail.com, u-boot@lists.denx.de, uboot-imx@nxp.com, Peng Fan , Ye Li Subject: [PATCH 2/4] imx: imx8mp: disable fused IP for UltraLite Date: Mon, 14 Feb 2022 20:55:23 +0800 Message-Id: <20220214125525.26954-2-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20220214125525.26954-1-peng.fan@oss.nxp.com> References: <20220214125525.26954-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0018.apcprd01.prod.exchangelabs.com (2603:1096:4:191::7) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 82b9b88a-a46c-4736-b7b1-08d9efb3ba3d X-MS-TrafficTypeDiagnostic: DBBPR04MB7690:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3383; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: peKvR0x/utGSbvSvw+MrD44nzbgp3sAjeZFGurX64uZpHOfhip5B00IQOhYwY+VO7uhVeyKueNYx7zSv91+Cr+sEuQT4aZVf33boTdXePLrOe0GkmMAU9cWY86jsjksKf11bA35jXzkmes70HhkqjDxii81ZFQr+1QQaw6gnBXUh5O31JHrKaR542lrB+m/jMuZSFAGH5OZYlHQRIiOiyugNtg8Pt1X0uwhieGo7UNDYBEEhYjnOqBYd6x2ue3GqMYNQKoekkm+5exjROBnDxrwoSVHuPOOy+WEUeUP1pDfvETA01V28as1RAPR3mfy10TJ68sp0j1842ZYoFjUrSyya81OyGbTmu2l5tof7jaKz3WgTpqgndPdtMirOERhpr1RwTqq6hhmf3RNXBlfVzTrT5ed2G5ZlF93T3mM/oBrtHtERFZ2VcwEg9daYC2s732mSNVwjpy2+OQbV66v6HxBBCvij/KLt9UUOK+QTRmPi/7sZDSrYlWSsaKj/i7ATPkP1X/MtzJy55O7TP7r0JotRu3gsbbLumT5OYvPD0W7geL2poVoB38CmSst1Eqn6T6x9GfKZc6iUDctS7zKBG5onYEUOw2yilQwYctcNN8nPMa62vnRsr382E3oziegH5xGlZ/yGJ0R8tjOzSzVqlHJxgDb9IEShdm3KJ0Et24JEl8wgPbbGi2Mr3uSQRVmk1d8XoNZEchrbEaN+COMrRqOQyTlHxuDJXih+gBcfIfs= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(4326008)(8936002)(6506007)(5660300002)(8676002)(6666004)(6916009)(316002)(83380400001)(54906003)(52116002)(6512007)(508600001)(2906002)(2616005)(38350700002)(1076003)(26005)(66946007)(86362001)(186003)(66476007)(66556008)(6486002)(38100700002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wyli+4XHe2mx/eIC1B2w8fB57BICmOi9wcICle2v8HDRzEKXLCLEezOgwImaRWxmhAqH5Rjv0Mft1L3PkpkvyDL69c6O+3t/60Iv2SC/Wf+AEccNpTxswBdxMZsVJZWCzXLPkB3XFZjekDm0UZj+XwbEgKtzmfpTA12+kouax+fHVWjz1KRbBhGKoL2fo0a2ijo0PULbun3JLiCWcXlnaIJ5fZz6uz5K7QhPg7X+PAdQQdivuVl40wZWZzC5qJDtuibK69mERc6dck68lonPUu/qeYd2ZZ+7m2EEz642DjG+WWAZrYIyS13kMuwI9kDqLhNhPrDqRiKUX4F/qO49gNLF+AKtzwL7cFNnp18z1jSZSwrRoQ2vV1XlUlRGsYTr4dpDBwNJNB6Gz6XgbMPcpBM1fd28nHuVFm/Y5TKhDLhgqi+qI+T/iipamKGn0jsAN+QTn/jsnxre8GjeZHINMVbLkT0w4EQAYgFjSGRZsM4Qm4NOBrVYtqHO3awQm7yHN7tCivJ6P6nKhdZQNtJyK0EoyubZj8qUVfAr0HY6fZcsmpx4NgYtoxAO+GLBADaqpDWIULkuBWOKbN9YV0Y7FfllgcISEiBSq1mWD4B2gL9p4OV7XmDzWKjqktAdrYQqVHSajs9w2Lr7i/s00dqNjkWwEPAJK2OQAzDtlLsgVmd15BZGGoOj6IvBt2TIQt0JbotvA/4XDmSrp/M1jBeWkK1l1igLuerFUtKBfcFk/9QQ9lOVB0oZP85qYD85JaGFQLSr0boF00HRFiREJWdBBqFsOCFCw2PJ5pd0ltUa/UzvxXXbiuqHRu0so/i1wyylgCRFC9F+MvfjOOEMwGACs2Ejy7lnBmdAL0vyuUqbKvfgGz7eDwpwwZFgTE5mUBHJFOnmCHPOBgqGOB9zoQsXDcqfQVYLBOY9ImqJKDPdrOHjnJM0TSS7XFWA3xAiPB77kd8S8VvIHbHVxvTO8trbK40AoIhwrXHYtdwNx+r0UA3PB6BTjzEHqQgApgm/BV4xeJwKTFDeDJl0OP/nLHZ6/5+glZnlmTYrdxsky8+lFryElVj6jqxNWDioHzT3MhYIKVrwCBszSjuLVFpxNKgtNAqc4rjAz160ZhXLnIPa1NoGzvF3coE04eD7Cd2dsymLh3pawsGvZ6NSgtLyA3HNztrxI7BdRHdzpjChT+lPAqcqu+bH5xaknL3vh3eLWzmXCkTtQVj7ef8sRMcaknnYktUmMn6DFwqFrGuNLTzlrvX2ilO6gnUUT82ii/kAwL1fDCNr7gbv2ERLmlhZ2p15z7hgHlUQQ8DTy4KiyFFVsDdrzBXVCn99NoO2AbC6euoyotm/MglrUE1kfjbWnfjG+r+cLAXD5OaC6WgzqfzskHMj/+USpgGQoQ1epuRY6+KGt8CleiKEFghvbZiE5dV5f81gdQ0OURMR9zebqvDLW3LzSRVS9D93gDDLo34LR9CCpXUuldVUnL40FphKPlkceCTVDjiHLptxTUDYL03EhnJKiipUF+pPkcxz5poSnWBwD2KL7Ohjq9NQIWeZ4gotKR6+/Qs3qaS20somtI3Ru5FYz0Ki05iWuNxyfvvwIgXt14VlP/2iLq2sYskQOTFsvGJ350Jq+94/xPKTVe4JEWQ= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82b9b88a-a46c-4736-b7b1-08d9efb3ba3d X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 12:15:45.3989 (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: KOHIKa/OSSNV5aBpp8f8r7/RB1A0NswRqJUJKQJM0jz2cnHDJEnopOmS/df17Y6QononT9feOQxwrL+fvWdykA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7690 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan Beside the fused modules on iMX8MP Lite, this part has also fused GPU3D/2D, LVDS and MIPI DSI. So we have to disable them for kernel and also disable MIPI DSI in u-boot DTS for splash screen at runtime. Signed-off-by: Ye Li Signed-off-by: Peng Fan --- arch/arm/mach-imx/imx8m/soc.c | 147 ++++++++++++++++++++++++++++++++-- 1 file changed, 142 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index e2d21bf6b8..91ff7eca59 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -905,6 +905,90 @@ static int low_drive_gpu_freq(void *blob) } #endif +static bool check_remote_endpoint(void *blob, const char *ep1, const char *ep2) +{ + int lookup_node; + int nodeoff; + + nodeoff = fdt_path_offset(blob, ep1); + if (nodeoff) { + lookup_node = fdtdec_lookup_phandle(blob, nodeoff, "remote-endpoint"); + nodeoff = fdt_path_offset(blob, ep2); + + if (nodeoff > 0 && nodeoff == lookup_node) + return true; + } + + return false; +} + +int disable_dsi_lcdif_nodes(void *blob) +{ + int ret; + + static const char * const dsi_path_8mp[] = { + "/soc@0/bus@32c00000/mipi_dsi@32e60000" + }; + + static const char * const lcdif_path_8mp[] = { + "/soc@0/bus@32c00000/lcd-controller@32e80000" + }; + + static const char * const lcdif_ep_path_8mp[] = { + "/soc@0/bus@32c00000/lcd-controller@32e80000/port@0/endpoint" + }; + static const char * const dsi_ep_path_8mp[] = { + "/soc@0/bus@32c00000/mipi_dsi@32e60000/port@0/endpoint" + }; + + ret = disable_fdt_nodes(blob, dsi_path_8mp, ARRAY_SIZE(dsi_path_8mp)); + if (ret) + return ret; + + if (check_remote_endpoint(blob, dsi_ep_path_8mp[0], lcdif_ep_path_8mp[0])) { + /* Disable lcdif node */ + return disable_fdt_nodes(blob, lcdif_path_8mp, ARRAY_SIZE(lcdif_path_8mp)); + } + + return 0; +} + +int disable_lvds_lcdif_nodes(void *blob) +{ + int ret, i; + + static const char * const ldb_path_8mp[] = { + "/soc@0/bus@32c00000/ldb@32ec005c", + "/soc@0/bus@32c00000/phy@32ec0128" + }; + + static const char * const lcdif_path_8mp[] = { + "/soc@0/bus@32c00000/lcd-controller@32e90000" + }; + + static const char * const lcdif_ep_path_8mp[] = { + "/soc@0/bus@32c00000/lcd-controller@32e90000/port@0/endpoint@0", + "/soc@0/bus@32c00000/lcd-controller@32e90000/port@0/endpoint@1" + }; + static const char * const ldb_ep_path_8mp[] = { + "/soc@0/bus@32c00000/ldb@32ec005c/lvds-channel@0/port@0/endpoint", + "/soc@0/bus@32c00000/ldb@32ec005c/lvds-channel@1/port@0/endpoint" + }; + + ret = disable_fdt_nodes(blob, ldb_path_8mp, ARRAY_SIZE(ldb_path_8mp)); + if (ret) + return ret; + + for (i = 0; i < ARRAY_SIZE(ldb_ep_path_8mp); i++) { + if (check_remote_endpoint(blob, ldb_ep_path_8mp[i], lcdif_ep_path_8mp[i])) { + /* Disable lcdif node */ + return disable_fdt_nodes(blob, lcdif_path_8mp, ARRAY_SIZE(lcdif_path_8mp)); + } + } + + return 0; +} + int disable_gpu_nodes(void *blob) { static const char * const nodes_path_8mn[] = { @@ -912,7 +996,15 @@ int disable_gpu_nodes(void *blob) "/soc@/gpu@38000000" }; - return disable_fdt_nodes(blob, nodes_path_8mn, ARRAY_SIZE(nodes_path_8mn)); + static const char * const nodes_path_8mp[] = { + "/gpu3d@38000000", + "/gpu2d@38008000" + }; + + if (is_imx8mp()) + return disable_fdt_nodes(blob, nodes_path_8mp, ARRAY_SIZE(nodes_path_8mp)); + else + return disable_fdt_nodes(blob, nodes_path_8mn, ARRAY_SIZE(nodes_path_8mn)); } int disable_npu_nodes(void *blob) @@ -1168,16 +1260,27 @@ usb_modify_speed: disable_cpu_nodes(blob, 3); #elif defined(CONFIG_IMX8MP) - if (is_imx8mpl()) + if (is_imx8mpul()) { + /* Disable GPU */ + disable_gpu_nodes(blob); + + /* Disable DSI */ + disable_dsi_lcdif_nodes(blob); + + /* Disable LVDS */ + disable_lvds_lcdif_nodes(blob); + } + + if (is_imx8mpul() || is_imx8mpl()) disable_vpu_nodes(blob); - if (is_imx8mpl() || is_imx8mp6()) + if (is_imx8mpul() || is_imx8mpl() || is_imx8mp6()) disable_npu_nodes(blob); - if (is_imx8mpl()) + if (is_imx8mpul() || is_imx8mpl()) disable_isp_nodes(blob); - if (is_imx8mpl() || is_imx8mp6()) + if (is_imx8mpul() || is_imx8mpl() || is_imx8mp6()) disable_dsp_nodes(blob); if (is_imx8mpd()) @@ -1188,6 +1291,40 @@ usb_modify_speed: } #endif +#ifdef CONFIG_OF_BOARD_FIXUP +#ifndef CONFIG_SPL_BUILD +int board_fix_fdt(void *fdt) +{ + if (is_imx8mpul()) { + int i = 0; + int nodeoff, ret; + const char *status = "disabled"; + static const char * const dsi_nodes[] = { + "/soc@0/bus@32c00000/mipi_dsi@32e60000", + "/soc@0/bus@32c00000/lcd-controller@32e80000", + "/dsi-host" + }; + + for (i = 0; i < ARRAY_SIZE(dsi_nodes); i++) { + nodeoff = fdt_path_offset(fdt, dsi_nodes[i]); + if (nodeoff > 0) { +set_status: + ret = fdt_setprop(fdt, nodeoff, "status", status, + strlen(status) + 1); + if (ret == -FDT_ERR_NOSPACE) { + ret = fdt_increase_size(fdt, 512); + if (!ret) + goto set_status; + } + } + } + } + + return 0; +} +#endif +#endif + #if !CONFIG_IS_ENABLED(SYSRESET) void reset_cpu(void) { From patchwork Mon Feb 14 12:55:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1592496 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=lb9pZWvm; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jy39F74l6z9s5B for ; Mon, 14 Feb 2022 23:16:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2DE2283BBB; Mon, 14 Feb 2022 13:16:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="lb9pZWvm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 19B2483BB4; Mon, 14 Feb 2022 13:15:54 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03on060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0a::60d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9A93783B71 for ; Mon, 14 Feb 2022 13:15:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W0ohWO+ARl4CKvYeKVdK1GZgnFmhMsenuJuowJKlV4gIUHMc37fljbe0UhHwLZ38T2S6o3af95pFgzK+gNlC6CudcOGYzW9lPGI8JXcJ3FmXOBac1KzpSNegkB6lEbqxNwK6AQXy/oV6R+bdULpHWalLUdhHlqtxdNe5GXpdxkT5Ta0OBA4t6Ht2roipbiTF2WI0JCSf01ulO6KM2Zfp0uZiZexEiVg3J1hOjOtdZUKjCzTG5uAlOcIjlPq6Ws/aux3u3KDatzaGFhrDrxiSXWpJ2w0VoJ+TuDg1zdFtMY7yPCK88RL403mfR2xxOvAmZf8qCw6XU/nf4wO0vtaa+g== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=c+wxyR+L1l+dR9Vsp0tN0Ie2ZdRTYKV3gU/eQVSzXUk=; b=mZ1RCdiL5z0s5DHZhi6bK94f/nZvyWJVZJeJY4fKZe8uBr3zctHIAMDif3rrYlXYs9sYfZ4XUia8P1ILOSX7P84T1GBkGMISfJQ/dhd5KPNbtHYlVxdSKGh4MGoLd/coveq6aBMAUb72C96iwPK+UHeTfmj3I60yJTbiYcxAedb/8CODkEq6wukClZ5nAZSmDVHCvquu9p98j4DQ362vJvW8m/42tRvSTuaKSHMntTrqjnaIBKUnkpZR31MBsUsmtD1cK25TKJ3RhmGJYbSpJyuT7NgcUhuj0at4mul0uC5f+0i6jYz3FwU5GA7/yEBDBRo0UYc1i5+jxVbdd2tiBg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=c+wxyR+L1l+dR9Vsp0tN0Ie2ZdRTYKV3gU/eQVSzXUk=; b=lb9pZWvmJ3nlkTytjakHLuvN2Ni2pf0pw459OWVWoGUbqTryJIuwO2fctGVML/IJWVKyNucAMqqUt8v1KCf3idXP5zYKY9NG/olTMp3zYBVi7kx8Xr0t2sGgIeaRVMhaQpvdMWs/2ofDlBE3/VHRmX0ZtcGGW7EbIkJCVE4FwKA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by DBBPR04MB7690.eurprd04.prod.outlook.com (2603:10a6:10:200::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Mon, 14 Feb 2022 12:15:48 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::448c:19d:ca9a:123e]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::448c:19d:ca9a:123e%7]) with mapi id 15.20.4975.018; Mon, 14 Feb 2022 12:15:48 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de Cc: festevam@gmail.com, u-boot@lists.denx.de, uboot-imx@nxp.com, Peng Fan , Ye Li Subject: [PATCH 3/4] imx: imx8m: soc: runtime drop extcon property from usbotg node Date: Mon, 14 Feb 2022 20:55:24 +0800 Message-Id: <20220214125525.26954-3-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20220214125525.26954-1-peng.fan@oss.nxp.com> References: <20220214125525.26954-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0018.apcprd01.prod.exchangelabs.com (2603:1096:4:191::7) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2818fe99-8b78-41d0-27ac-08d9efb3bbb4 X-MS-TrafficTypeDiagnostic: DBBPR04MB7690:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:499; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nrcAyk+KEGIMm2fZOp1y7dvP9UP6VZqSEBVIVAkUj4j4SsRfRDt7el6uCMN1jat9pHjhb/1PrG37mqTRSeIvFky4OerkDzt49K5mGbluCD9M84+Up+itW+7Q5noSKKlsx2hRS/JoAT7fbC3Nl5L2FY1cHH5hlNJtrpKz60Fb6/nXh+VaoNVZAooBW6EOPzPvvhYGlqwtdYskue/+TguvlPEBn5ehntNNMhCwmqN1b9NOTRKBrM1egs/X2NqnU2jxfeCKJ1hkbDHjuRlaEJys9ZpyW97KPdsDA9a1cUDPEXIK/4ewblzeoij1a71A+MewTY5nv81dTiyW+Lhall70ledI/hvVjjIB9txkaN0lqogDz/V8XPQVIx5T+3/wgLzuYiOnCz0doRl4JlaKnr78sa4/77Ob0E5KHNj3yycUF4irGY7KCf6WmMDniaNbqcfmjV9bH06oxoiYnga6uYqBvSj0zk2CAvy0POVmQIIIw8ghwLjJmDVULuwQrc2SqwygpojzEdEBTxbfL2OEvu2ru/dMGHNrVI43tN+H+bbXs/nCyhyP/U9NoYX/OiN2ewpLVl2Y8kMk5joZPLJCTKPKy1AJaCA0v2/VdGii3RPzxTYJZkEmeYFXR9uFPm3CheT+3TDWOgMcgM2fF8xjj9Kqy2i8LLxLdUa6gWzt3bVB/8om4HvsorpPDKbeDajY2ivTsh0azXxN1GG9ZLv9RJQLLvOW2xB61b11DdawZK8Zk50= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(4326008)(8936002)(6506007)(5660300002)(8676002)(6666004)(6916009)(316002)(83380400001)(54906003)(52116002)(6512007)(508600001)(2906002)(2616005)(38350700002)(1076003)(26005)(66946007)(86362001)(186003)(66476007)(66556008)(6486002)(38100700002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 45110SRlWsbAXVUlEe2S8B00tLRwNejVPftChSN3jfGOsZWoBFtHdhU/qIwVddq4FzszDFzoLjclXkZYDgChjVUmhs4wF4W2Zi28alYosWcT78ZHylXQaMLx9CiWxcAX76rE2MebNtYY4serNPpG9UwcWMfocgly/YiyMQqGu4ntlQGiQHGDw101nbHB2Ja87quCbLsdaB1Rt38/n9BQlbCWpeVZ0kYqo5KXSUYQQYbvcAlvB3I9aOvC1ata55f72ceaCvvrUrSiBfivfcMB5HmbD2TVWYjm7XHM5kuHDR+C1JypYRWy1Uet47LsxjfIaz7n9byW6C2jHuj4EpjSyTkew7jX2yKZesXIk8ekELslIxNNSJxpaBCn1U5crA2os0r/q+DfRzCsezlt10F8Nd9FKflodbpNhnhUaOH7Jre/VzfulzYHMbOjQEwMHwDAvi79CztOKuKD6k4vLDkiosCJdL1tTndUQof/+KotTOokai5BwIjwGq36MqwEtV+VBn+PlTkqBllpo8UIUitQH7qaLrc1bLh5FBJ79qulNeKwv/YeZ17RMLZ/SQNt8cdYxszIGL+3CsgUDbmESg595ztHhQkBKFdwRmGC6CPQ+5pBDSJRsdJRHuZs9gKvEJpCDKoFK4kkbe3loIyuIdW7dURUvCxri8HYyOKWFfsKzA5s6i0v6sVk0Yfku8RRGgUNnvcnn+KhsJUZs2oaBiUGrwG2au7jbf5vzWck6xrTAvRyD4I+GFQbjJPmKZOHV4Frx7B9FF8Md2L0dK4LpyAiJ9RqF0Q3pAt31FYcS5XQEFnA3RqcmZdGIbH3KMyNMss6ppUp9bvDiVMJOL55ek+bYzXyLLNMe7rxVbd0KCTJBZkOcyyQJ3DqT60KgnVtgniJpkfA9RejE8yxfdqwBq80SfmDV8po9Z2J2X67ED4HZtkkMwGJIGUB5CN2u5Ll1+HAt+ZfotEi54kPsxARsJALFROa+j1jc+m9mZf6I7PoEJlCpiInt71Uw2Nx3yJ5UG0oYKIS+zAC0zn2cuip4mrOWWQVRZcDiiwk8Fl7A6Eq2MdqgwAU/YCrAEfCc0Z5PX/uTOrN2JYypPvXtoKccNh1gRbk0g1oViiDCcli0kHEq5AGCHgzXWxwHnfso4n8CuuKS1TiDYAPVLJgsHhiZA6+M2itZ95MEI3YDgBRiVzAE1CzXKekvWOovqDlP3RbYzMyX+iQ1EV9+ff6kD/xAduU59yI3psecYYO+kJgrXSwF7/pByVxXPpPJG5sKDg39sR1D1DZ/4Hcf5ehi8w31fBQCvLh+li9o627A7yeMY7D3DEb8Zh2Wc31NW8eCAc7HgkOPE6KiQ+U2DqWohczAV9v5kYx+BomKGlYWxvrvDT/XfUpctMFG3CTcdCwdMTeCoVfuWPm9AJ+DN30G0UARIxwb+4uy4vBbVAtRudxseMC13oeNsJ47erdJXYzMe4wVN+mjQYwxarn2IvSvHlNmcU66x0BdOQB1jkxvhL/nlclte3IBdUyspeylIoK7WFPOFR5PNd3g3HYJpLdcf7aqwpnBreHyguaQYY78OW4snJ4hShh84b+cI6ZTYCv9m6ovYak1Nha96b5YsOWN3gSgnPwUIPdR2ntbYN/tS4Wn17TCGA= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2818fe99-8b78-41d0-27ac-08d9efb3bbb4 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 12:15:47.8997 (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: YEPBacIrZbtzY5oWsdC1xzVR8+4eRsrWeby5KDkBE0sS020BcxTRxWDCD/skU1GHpb3uydqkd5G+K6J8Qqlt3Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7690 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan The extcon is an decrepted property and not used by upstream Linux and NXP 5.10 kernel, so we remove it before kicking linux in case it is in dts. Otherwise distro kernel will not able to have usb function. Reviewed-by: Ye Li Signed-off-by: Peng Fan --- arch/arm/mach-imx/imx8m/soc.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 91ff7eca59..6802b6e478 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -1146,6 +1146,37 @@ static int disable_cpu_nodes(void *blob, u32 disabled_cores) return 0; } +#if defined(CONFIG_IMX8MM) +static int cleanup_nodes_for_efi(void *blob) +{ + static const char * const usbotg_path[] = { + "/soc@0/bus@32c00000/usb@32e40000", + "/soc@0/bus@32c00000/usb@32e50000" + }; + int nodeoff, i, rc; + + for (i = 0; i < ARRAY_SIZE(usbotg_path); i++) { + nodeoff = fdt_path_offset(blob, usbotg_path[i]); + if (nodeoff < 0) + continue; /* Not found, skip it */ + debug("Found %s node\n", usbotg_path[i]); + + rc = fdt_delprop(blob, nodeoff, "extcon"); + if (rc == -FDT_ERR_NOTFOUND) + continue; + if (rc) { + printf("Unable to update property %s:%s, err=%s\n", + usbotg_path[i], "extcon", fdt_strerror(rc)); + return rc; + } + + printf("Remove %s:%s\n", usbotg_path[i], "extcon"); + } + + return 0; +} +#endif + int ft_system_setup(void *blob, struct bd_info *bd) { #ifdef CONFIG_IMX8MQ @@ -1240,6 +1271,8 @@ usb_modify_speed: else if (is_imx8mms() || is_imx8mmsl()) disable_cpu_nodes(blob, 3); + cleanup_nodes_for_efi(blob); + #elif defined(CONFIG_IMX8MN) if (is_imx8mnl() || is_imx8mndl() || is_imx8mnsl()) disable_gpu_nodes(blob); From patchwork Mon Feb 14 12:55:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1592499 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=U9JOnCiP; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jy39R4yg5z9s5B for ; Mon, 14 Feb 2022 23:16:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8633083C40; Mon, 14 Feb 2022 13:16:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="U9JOnCiP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0BACD83B71; Mon, 14 Feb 2022 13:15:59 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03on0611.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0a::611]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AF64683C16 for ; Mon, 14 Feb 2022 13:15:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HEj18UkRUzeGLGlchy5Z752kXVvFXeDUK24q/rSlWkStN9i33/6fqaM5xNFV2N/xdHfCAblhpoyuS3e6DcPWKOx2j0FAWQ3WafS9NnDxboD7BHcRL88BQq3XUcQjG4XlJj+OMFzK7qlYR44K2mikrJ1DwgiAjkrAdlzJvSotU6HtXddRUPg4I+KrVRNY/M0LVjvhL1C3uynqk7Pu3Ae5TKeiZV62dMAiRquMeW0Uo+kwFdpNgDVhBfQMvDB5YSzd7E9mrDm6HZvPcLkWQEpPTLvPZM1vhS84kbYQyNB2gKa17g8mYLhS7szyyIcLn3tikw2rhGfxw5vik42zE2UIJQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JdpKTVGeCF2p3Yz4I/wcACOQ+9TCaQgoedBbOqreMDE=; b=UoJO+Z1zosIKTDsPsj/+0QVbQYUj+XcqDjxgaaRyCQCvwP5qvWhG7EytpJCf8DeWI3x38i+PBk+9JD22f76quVULpkPY7mR6CcsJM9BaQ6w3UwnXPcinUbvxPndcxAHlzo8iJeCysOStYXAVkArJaRgA/XMkXiKjmdoYSHmQkG3fzLux7yAB6GU7nB5G6DyNNMgweC7swymUm5bEIi9hrKLuhq8Aj8gbkLalEBzYxs7FRFGeit/HolOIM8VxyAfjnTDUNvZxjQHqBebw3GWPLUVg9BDuQjy8ubPKTjcnLplExVktSa7SdnVP9SOa9UrVPZJwliOuRk8RJ0Fe93D7eg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JdpKTVGeCF2p3Yz4I/wcACOQ+9TCaQgoedBbOqreMDE=; b=U9JOnCiP1M/phyix1m0VcV4XWqepV3KoTxMMg84uDcYYvBrZwjm2mTNDrUeFsiGnM7sU9a2sG1FLcxSefyDRUe4q8M+/3OI7wJuvVU1j/nWNQTfhea89N2gEokef2WviEesNExODNABGy714Jektw8S62mimBoHE+cowed+WPh4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by DBBPR04MB7690.eurprd04.prod.outlook.com (2603:10a6:10:200::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Mon, 14 Feb 2022 12:15:50 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::448c:19d:ca9a:123e]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::448c:19d:ca9a:123e%7]) with mapi id 15.20.4975.018; Mon, 14 Feb 2022 12:15:50 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de Cc: festevam@gmail.com, u-boot@lists.denx.de, uboot-imx@nxp.com, Peng Fan Subject: [PATCH 4/4] imx8m: soc: drop phy-reset-gpios for fec Date: Mon, 14 Feb 2022 20:55:25 +0800 Message-Id: <20220214125525.26954-4-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20220214125525.26954-1-peng.fan@oss.nxp.com> References: <20220214125525.26954-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0018.apcprd01.prod.exchangelabs.com (2603:1096:4:191::7) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e1c38a5b-4120-4c29-7e14-08d9efb3bd04 X-MS-TrafficTypeDiagnostic: DBBPR04MB7690:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:449; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +Syl1kJ1oVmOzV6KgnlsQrmqPecaY0enU8aNgxj9N9T3CG0nRMXmQYPD2KVeOS8ClmqwNvOp8xP0qqJPRf+ak4Nv5j0zsD+Dp8gsfTpLlKYDx2Olz39tDolfVi31gbMaFtYouiOYtu+EFbhU3mI0OwbKp6hEIh6rHYdWQy8Ikb+TDG1149npbbLFkSQwqvP+F/4r0s/wo6u2u0k64v9JhBxPF1q1HmI61BQW+LlcLDWsNow8JKzkn8pYdl2QLlT7PLJXXpDFlCKm3ZMKk3KUPDbdOOScceOMWL80vryp2b/HhMRtXVbl+YOuSxx/OKbkH48VATBT1bhl+ATiIMc+dK1RabvKaXa7pNjd9tmAkjNDcgmsp4vtx1lyy/wSceNANz3xVOp9AgMrkYCwvbg6jo6Czr7fUexriXgmD3YZRdb4b+GBCZaiSKNa/xhCZcffSgPSxLIM2nrG+6famHlk3CGKbmV84HC/xgsxwnG5DAfFuHc1H/hPGe8MD8Bn983R36AWBoHScAwfOU+7NcxMmJtBWrpv6HcLqUmgSU9tHabKWQdJX87B8kKiE3VN2BHEeMhaEZNPBvwlHK+xkoymc0LVlpGsgCKOkgvVywwaivMEnKYVKGFRf7vPu+SxMVD7rmITJ1kZrWB3/JNGsHSJkpjr0UwDa3E2zQ6DFo6WcGezResQI/vPuabecYI8ryT9iVdkOLju0I55mGV12rc+QJYuPh5FpIeyajs8pK5Yx1o= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(4326008)(8936002)(6506007)(5660300002)(8676002)(6666004)(6916009)(316002)(83380400001)(52116002)(6512007)(508600001)(2906002)(2616005)(38350700002)(1076003)(26005)(66946007)(86362001)(186003)(66476007)(66556008)(6486002)(38100700002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jdfF6eWOFqTCoZEPg5SSMzeK8iDsaP4VAGXFpThl0/ZS0jjIhHMHvGIwGuBvAU67FnU6K5jlOYVhHJW4NZhHN/qh24/G/Iu44cZAq0S2XMCcLGj4oHPIRV7XGsFQs42k/P0MATB4qvpvpw1iIq3sfegfHP56wkwtuSxYTYmSXnp41zSbS10FwnBXFgpDfFWfRv0oRRuupvPtUb7YFIvSBRJO6UxLfrG2X82xQhPD4YH3VMjLU8UPHj2p9tFShnnW6fQsHNi4BUQ7HKE2+a0N6Fv8lqVGhpcVOlu5kOoVsL7+Tk4p4BlZZvhEwkHDymPpIy9gbUQUtvaYkeEoriRIbH3cSS6sGcyH+WE6qZt+X4XXIlot2Dy67HNiaQbsiAsRzPRxojS4Sio/UVJ2ZEYxPWQrmfoik8wem6zuvVRIojrm4lWPZIhabuJmtwP3ntUUAGLoI7V+6mIJrT1RrBUTMWr7sFSsXeCBApjyyBbYa3OUMpFxyo9saeXVXTnrzfXn6tGrTBGKoO4G4eQ/Oz8bEzFm/Amqod3jensA3ZnW8tL1DpvGBg3N32PJQ7CajFz9IqypT9VPK1d1QnT9G0IE5Lp7iEaq8PFnfVpydFnvndvYaUQKrB6r0JLYg8oD9fYEBI/yOoSsk9euTvEuqXdmyqVFhroPOLPtfUW8xBWTm9/GXCZE0cXo+PBr9TeS56PZrvYYxPcZJ9cbVkd+LU5gIgJPcVDQtRZjvjBcfZUuTspLhHXWSQEief+02HgSaI3RsCX/MJNCziIl5KoQmjXN0H/poqfhR4JI1wW+JhT6rFDA4AHcIUuzdsbwsW2JzEMrNV9Zygl6NINeULCEq1ozP6hmm3I0OJbkA3agDFCh0LzUZTzWnlxNw4y2obgEFjxfVW/4U0aesEPOGCOXOG+WRB/sxrv64DO+vdii6MVNj9Kjk7pL/lBWSF7lKC/lUBb6/VX8n8JDgBKT/oKvcE5+1/n3Xbop3KPepZ03eZjnOTTBBDzX/7eHxh7pJcjQofuIkG1nxzEvui33ZvFDPcrb7sjWUDaHzz8/Wd8ZmWt0zPSHKtCsM1K0VzDMOjBcg+/xas1ansUPPZO7oyDF3gV3sr0zJonObgC6oLQoM+SHJtHi9TAHG3uukSclQAApJQksVcAqLyLPWz7xP5PRv0L5p6xXFjQGDcQ4r9rCTGxPtUI36voGVolq6Kjmh20d4WE8nrEVGvfxUtcPY21MWDijMuxWrIrbJjxx0DU12MLFnpfzwwPvGo+r76C3ttMoZdqkzu+lE9PeoCjPz7X3NBQ752kCNveShc5rU47gAuOybhnkv6TpKD3pcu4hftWJVBmRqCrDnS077n70yWIRg7WJ4W30tRTkKG6mQ9mWEzx4KeqJgKXa+XmpeZhZA8WaKAVtLrvflJFGlld1oLy1C6Uy3lKSRcGaxxmHCu6TWo94oZ8x16ml4b+QaXa6m1j24CUnJHAWFJIINMjxMJq9rCx6MQx6rDrTlVBiO2lSheaAsZACCCrsbQXV/rww1+t7KEteakxurcURPR14OPblHqrrWveMJ7LbWHiZwAb2wxCZAHR3qWgTmfWOAAM3R+IqweVkG0Z03+k90BSm18GZRsB7nEuDubKq2vwUPIeQIdN8dUs= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1c38a5b-4120-4c29-7e14-08d9efb3bd04 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 12:15:50.1039 (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: Ryi0CQGFISHDUdnhA5KyB7isMxI4P0i9wvlfMhREwgY/N+HMb7XbmIFXIhTcCgiM6qW9pAXQLE1ga/kBlspGug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7690 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan Need to drop phy-reset-gpios before booting linux, this property is legacy property and replaced with reset-gpios. If provide both, kernel would failed to request the same gpio twice and cause fec not work. Signed-off-by: Peng Fan --- arch/arm/mach-imx/imx8m/soc.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 6802b6e478..f1b998c5c5 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -1149,28 +1149,30 @@ static int disable_cpu_nodes(void *blob, u32 disabled_cores) #if defined(CONFIG_IMX8MM) static int cleanup_nodes_for_efi(void *blob) { - static const char * const usbotg_path[] = { - "/soc@0/bus@32c00000/usb@32e40000", - "/soc@0/bus@32c00000/usb@32e50000" - }; + static const char * const path[][2] = { + { "/soc@0/bus@32c00000/usb@32e40000", "extcon" }, + { "/soc@0/bus@32c00000/usb@32e50000", "extcon" }, + { "/soc@0/bus@30800000/ethernet@30be0000", "phy-reset-gpios" }, + { "/soc@0/bus@30800000/ethernet@30bf0000", "phy-reset-gpios" } + }; int nodeoff, i, rc; - for (i = 0; i < ARRAY_SIZE(usbotg_path); i++) { - nodeoff = fdt_path_offset(blob, usbotg_path[i]); + for (i = 0; i < ARRAY_SIZE(path); i++) { + nodeoff = fdt_path_offset(blob, path[i][0]); if (nodeoff < 0) continue; /* Not found, skip it */ - debug("Found %s node\n", usbotg_path[i]); + debug("Found %s node\n", path[i][0]); - rc = fdt_delprop(blob, nodeoff, "extcon"); + rc = fdt_delprop(blob, nodeoff, path[i][1]); if (rc == -FDT_ERR_NOTFOUND) continue; if (rc) { printf("Unable to update property %s:%s, err=%s\n", - usbotg_path[i], "extcon", fdt_strerror(rc)); + path[i][0], path[i][1], fdt_strerror(rc)); return rc; } - printf("Remove %s:%s\n", usbotg_path[i], "extcon"); + printf("Remove %s:%s\n", path[i][0], path[i][1]); } return 0; @@ -1271,8 +1273,6 @@ usb_modify_speed: else if (is_imx8mms() || is_imx8mmsl()) disable_cpu_nodes(blob, 3); - cleanup_nodes_for_efi(blob); - #elif defined(CONFIG_IMX8MN) if (is_imx8mnl() || is_imx8mndl() || is_imx8mnsl()) disable_gpu_nodes(blob); @@ -1320,6 +1320,7 @@ usb_modify_speed: disable_cpu_nodes(blob, 2); #endif + cleanup_nodes_for_efi(blob); return 0; } #endif