From patchwork Wed Mar 27 14:10:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1916754 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=gySCCk9n; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V4Rrc6c80z1yWr for ; Thu, 28 Mar 2024 00:11:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A6602880DB; Wed, 27 Mar 2024 14:11:18 +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="gySCCk9n"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D6C248800C; Wed, 27 Mar 2024 14:11:16 +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.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20612.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::612]) (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 09B10880A6 for ; Wed, 27 Mar 2024 14:11:15 +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=I9uU1juQGM7z2H+RJPZfe79GWBO8kKkDcScdWFLvi254uoj/EvsJpFoQHhmCbvPrFwYNRSYzV3eb8uA14ju88MeItLulKrUD61ByjG3ykpkSF29yrMpIK6xagbl1lLGyDe9q5jcciCzM8zklayR9NBinvxxLktTx5ByjxDNFNjkA8dNy+D9uR5fJGIG+kcE7RrkG2iroBsvMFCOmG4sue7+hQGfIr4jKyJa22A+TX63WuvI7qGDh0D9Rxz5qmp6pvJst4ktJVp7n8m4lhJrkr90DOlTgNixOjwQ3xccl1oMx17jDWmqn7VRb7XolF4HAQNzK4SZv+z4Qn3olJDqASg== 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=3i3haQXlV3blF7oFjyEvD87LBI+PouqducUOa9tuVIU=; b=WdtJ7/6WwaeUIyhsVZgzuZsbUTZud3fFPzVLD6Z8sS3wV1tP1qf0X7kH+xFzSGzb8j0ImRybXLTjTMQBqFI2vB/kLdadO09dqu8Iqgi2S94C6dbanK5mB9ErOvWhEKwTw27cbziCs4augkWi3ergrNT2kpVcl2vATo7r0naSgAWmzm5NieaoPQBsEizLC0uNnBCn3ZViUcWHktV+0GRjEJxn4ldgO8arsl83qT1ATuNqYScZnfDd6xB+Rf/kkx0iZoZwE/thVvQthzn5bpAfEXBlzulkqf4zYU4SCgxtK6ulkWkvoPYygNgqwhvNIhIDQpLOlSETCKCKLZbZQZ4X0w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; 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=3i3haQXlV3blF7oFjyEvD87LBI+PouqducUOa9tuVIU=; b=gySCCk9nXyDkr2MQAbOvX3FCsIkhW+ncnIdoBJagKY+OUTHfURa6+jV5aCzlFjw1R+c3+qZJNZq3Y2udm15/cAPr/hc89vtw58vyV03cyPGbwVT6Fg60Iu7QW2WPXySv+3zS9CEvzcuYAW663aQtkePdtbFB+KPvuVD6k9sK3aA= 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 DU2PR04MB8536.eurprd04.prod.outlook.com (2603:10a6:10:2d7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.32; Wed, 27 Mar 2024 13:11:13 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::d30b:44e7:e78e:662d]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::d30b:44e7:e78e:662d%4]) with mapi id 15.20.7386.037; Wed, 27 Mar 2024 13:11:13 +0000 From: "Peng Fan (OSS)" Date: Wed, 27 Mar 2024 22:10:45 +0800 Subject: [PATCH 1/6] gpio: imx_rgpio2p: support one address Message-Id: <20240327-imx93-of-v1-1-afab6b31422a@nxp.com> References: <20240327-imx93-of-v1-0-afab6b31422a@nxp.com> In-Reply-To: <20240327-imx93-of-v1-0-afab6b31422a@nxp.com> To: Stefano Babic , Fabio Estevam , "NXP i.MX U-Boot Team" Cc: Sumit Garg , Tom Rini , u-boot@lists.denx.de, Peng Fan X-Mailer: b4 0.12.3 X-ClientProxiedBy: SI1PR02CA0048.apcprd02.prod.outlook.com (2603:1096:4:1f5::11) 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-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|DU2PR04MB8536:EE_ X-MS-Office365-Filtering-Correlation-Id: 5fd92a8d-fbb8-4389-5642-08dc4e5f60de X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: adEhQCzrmZAg3lBDyNiZmiIJNSIGgd1k2P45QCj6Gn08sWtE4xLHJ6vCk4ow6BQL+OR/pBgv6iJ1vaxFFIyJPRsKx6GUJaHcork6S52i+2qfMHJCxy6bdpZU20Tss3goiZcCGapOdNUTD+nwTcN1ddmj/7gEdND6jiYUZPh086vclpx4gY5sfayfqaLLG/t5YKoub0vfMKFGrwQ33wBh38xHgjRcz8PYgW6e1tD8U7c8rWZvgtKnA9Nj3pXBCmoYn33Y1aqp85XiVBcyItpfmi8Zypt+7Vx1pcnzr/qZQofU0bDzdRbQ47zDu1saj2aQxcpRZ9YOVXIRPNbACznp2cx1VkjonysdsMyJ8mOh55zADr09u492c4Oq9TurD0XOQaKWB3NYA04leTLuH+WyyrEDxUxygMjTrWBZ+tc9bHfsAX50iAYhwepYOAmijy7lwPNVRr3OqJJ3ww6UETGLTeKrPctM2cVeWb4Nf/Gf7Q3wuER/p5O1N53ed0AsmbjC7YvDJtBY9OSNxZBQVrQ4uqRMnXY74peXc+/KoSjhNHbPSpuM1fNBBOaL3K723p+SYhM5HX63eIk1idMFpNq1PuBCDaqsNK5KMfZndvPTvZncTmh+ET0OeUQr6Z/izgXpvseHFhW1kt/PgTxbGlxuESOyQnGx4q2FSSNmwAeCkhmc2yvwX92sBp3gN8A1J1np0IcVk7PbhWlrK7Ckc+Kp/0N1SD4Gtf09MdUN+j6F/UI= 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:(13230031)(52116005)(1800799015)(366007)(376005)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?1YprHC+c1Qx8UpBASTg+ZL7imc7N?= =?utf-8?q?9BJgQ33HEnijELUhy3ILalhBAq2bOnKzvRUW77tZUptIYGifl31FYUGZIaQuRJBKs?= =?utf-8?q?WXk6OoWorEokAUppMuk7yx6XZF5Iiynvdnl7qwleRn1tPXuae2UKlUQl5TVSrDZPm?= =?utf-8?q?T1+i062AUTJ5rjp9nXQ/LyGUhdAZkc9NTOA1OTEwe/bBEzYY+Osu3Koku97Yds9J5?= =?utf-8?q?aB3RpXgk2vZpGcaLjdDZopL5SP1ANylzHSPNWSyjZA6gJVMcGRsaKoc/2CwWKY3QE?= =?utf-8?q?2xtCcYJS75a2slMxuA4ttXRq85nbgD2aROlmldrZByyJORENwB3pmKN5MzCSKTcxb?= =?utf-8?q?1wvc8R0qQXr2yiVdajWGTlKY1DptOl3lOWLTVBrWMBTfYhKUrGYdSq+gQ3ljo8sl1?= =?utf-8?q?NnZDInjTnhuljIF827RPWHzLPw3x0KQxXEwuWnnyx95f5L/uyzKz9E3b/fGy0OgY7?= =?utf-8?q?WGcoG0Tlz6MTJiWxsPcv6HZSHZwUPUrAYYVPgwCPHknFVdj8TFrz6HC6B1Vd3zrH6?= =?utf-8?q?yR2khcFfVg6cBabOnCptDDC7wfVFkXjINa2OiaMR8frecvEeCQNHLfQryHcx0zKFi?= =?utf-8?q?9vN3cZJp1+Sp2hGrwxwU3nY2PNC1CsHsV/+4Y9K45xRpeaI2ehRtcZiZfjbqzWO2d?= =?utf-8?q?2EwCTbb4ZYNvBnJqF7mIwnaCCSlk0E9mFF02jesTBpFpdWBipRk1MFpbIpovgUC8l?= =?utf-8?q?vrAiynt4dgRxA6d+eRCelGAXQp31HpDVUyhwAhbTHT18rXkN7/VnebeLJyFn2zjtN?= =?utf-8?q?g5I6J4+RFjPO3rBEWIQeSVypKG4M8pawttJ8bICybLt7FQPwD3n/zxDPV4iJVKkW2?= =?utf-8?q?aQzZPKknvMD9ZdJob+aFRI7SuMa3DDPpRPax0YDk6dqr8vT14lpw3k9JScHbefNjD?= =?utf-8?q?QZsCsuAJYZgea3paiBG3fqVUKYCTD1c8EIC3x/B1mP9e4ruh3bUwOOB+rtArnRXWx?= =?utf-8?q?l3Xu0lekjm8AS33Da09xXKGi9w/diKWuUtj60QSWhrE4ZQJ8secMnYMLP7hADTQ2T?= =?utf-8?q?Y/gNhqxvCd5gJNGnSVO7JVsSUafohBmSLuKBmcHJYRX2qD4NAP95DkgBfrW4GCBHC?= =?utf-8?q?6L/C/TAShi6zhIBtV9HP0M17HxS0sY5DLmMHaylwIlaC+FJC9ulrl9aTQzIej3xam?= =?utf-8?q?odYqBpxUi0O+diDWo1qqUE8NNOOvVAtKUKRo/2QE8GRXOvZChXSYS7wPN+Xzvho8V?= =?utf-8?q?7ZvO08TAcQs/sXm8uY8exwSogVTkhIeJIJhK9IkO43TC0vofpQAKlwzd9YhfjwySU?= =?utf-8?q?4ssl55iB18ybtd4kO7ZR27Dk0Rwcb10+K+z0jeDxQTRZ4p5kr8eznKogfpnEq5n7Z?= =?utf-8?q?zZgMPPe+0yKlc3UNp59P5qFt9voLQ3G+l5YHDfi2Oh437qXMDsvXb8w3rXF3njRXt?= =?utf-8?q?CKvi4fIcS6i/5X+lK7VgBK1WaVMbC+YqEBNZZocQ09CaotHK7r5q4D6/xb3udzSq3?= =?utf-8?q?sSAy+5uCHubKfP8voqoEg/MQYFb1nWpDmOdvBZyl4e8Vl9ilz+t4VNIGTXjtTMa1P?= =?utf-8?q?sc5f9T5BwRQa?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5fd92a8d-fbb8-4389-5642-08dc4e5f60de X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2024 13:11:13.4844 (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: xyOYgoAlNwnIeyboB2WtalGtx6MkSmxZb9/lGS4+ArbOM+Eg//0Lpod041OD9idPajmLQtCRoArDXGYvFb7++w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8536 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.8 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan The i.MX8ULP/93 gpio dt-schema have been updated to only have one address entry, update the driver to support it. Signed-off-by: Peng Fan --- drivers/gpio/imx_rgpio2p.c | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/drivers/gpio/imx_rgpio2p.c b/drivers/gpio/imx_rgpio2p.c index 175e460aff5..3227a8d5b57 100644 --- a/drivers/gpio/imx_rgpio2p.c +++ b/drivers/gpio/imx_rgpio2p.c @@ -21,6 +21,12 @@ enum imx_rgpio2p_direction { #define GPIO_PER_BANK 32 +struct imx_rgpio2p_soc_data { + bool have_dual_base; +}; + +#define IMX8ULP_GPIO_BASE_OFF 0x40 + struct imx_rgpio2p_data { struct gpio_regs *regs; }; @@ -165,6 +171,9 @@ static int imx_rgpio2p_probe(struct udevice *dev) static int imx_rgpio2p_bind(struct udevice *dev) { struct imx_rgpio2p_plat *plat = dev_get_plat(dev); + struct imx_rgpio2p_soc_data *data = + (struct imx_rgpio2p_soc_data *)dev_get_driver_data(dev); + bool dual_base = data->have_dual_base; fdt_addr_t addr; /* @@ -176,9 +185,26 @@ static int imx_rgpio2p_bind(struct udevice *dev) if (plat) return 0; - addr = devfdt_get_addr_index(dev, 1); - if (addr == FDT_ADDR_T_NONE) - return -EINVAL; + /* + * Handle legacy compatible combinations which used two reg values + * for the i.MX8ULP and i.MX93. + */ + if (device_is_compatible(dev, "fsl,imx7ulp-gpio") && + (device_is_compatible(dev, "fsl,imx93-gpio") || + (device_is_compatible(dev, "fsl,imx8ulp-gpio")))) + dual_base = true; + + if (dual_base) { + addr = devfdt_get_addr_index(dev, 1); + if (addr == FDT_ADDR_T_NONE) + return -EINVAL; + } else { + addr = devfdt_get_addr_index(dev, 0); + if (addr == FDT_ADDR_T_NONE) + return -EINVAL; + + addr += IMX8ULP_GPIO_BASE_OFF; + } /* * TODO: @@ -202,9 +228,17 @@ static int imx_rgpio2p_bind(struct udevice *dev) return 0; } +static struct imx_rgpio2p_soc_data imx7ulp_data = { + .have_dual_base = true, +}; + +static struct imx_rgpio2p_soc_data imx8ulp_data = { + .have_dual_base = false, +}; static const struct udevice_id imx_rgpio2p_ids[] = { - { .compatible = "fsl,imx7ulp-gpio" }, + { .compatible = "fsl,imx7ulp-gpio", .data = (ulong)&imx7ulp_data }, + { .compatible = "fsl,imx8ulp-gpio", .data = (ulong)&imx8ulp_data }, { } }; From patchwork Wed Mar 27 14:10:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1916755 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=lXGkFcvB; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V4Rrq3dYPz1yWr for ; Thu, 28 Mar 2024 00:11:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1D46588019; Wed, 27 Mar 2024 14:11:22 +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="lXGkFcvB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3FD09880D9; Wed, 27 Mar 2024 14:11:21 +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.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20619.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::619]) (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 165BB880D2 for ; Wed, 27 Mar 2024 14:11:18 +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=cIVQKPtsFdKDXFBGL0Wat0gPSxjcbEkpccfauGIGR9IkFKi+WzoyASrdnOxeeGfPLTy4LLnRMsJsBQqeuPM7VT4nGMvJAE1XkOL9e+wkJWMaxWQVpfU0dVvPdtW0Hga9F+TN73nF7W9e8wCBwKcYOFwLgLNSX8tkycoF0rAno/I57FFTAswGtrqDXiouhWMak4zNuajgHKKyzRexp2bAfSEwGn4/GcEQ1RABEJoQpCHY8lCR+669t6yFZYiFzrqNSYKObYM9HeQvs+tExXxr3b2w2OmaNLXZfFBYQ7wCzNaM4MngFti3ja47nOv3SXtZsTGkZnl0j5jUKXCxKAV/Vw== 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=KGHKDlu7iTW2jC9AZauBYtxtmV0PjeCY5piYfD0f3VE=; b=kI2NSWxh74fhR1mQPO1+mr1cwxdB27wrupjVVVVx2p+Do/xCYRwmHxAI0ydi/QfZ8DMqORSPTo3dbvMpZhmjenFDUo6i+M/taCz6EdsiAqEi99AXX9+dqv5ZVtw3CpLz4IARReCvLqb4lj/rkKEKUwji3ZhsFpNT6cYqMi/GkipGIe8HalNaQ7Ttl3ifxJkkz1X/lRWELkmS/68idJSLknxzEW4Q5lWewaOCXgKk0n6R+itkD26E+1+afnB+LKoNox/46Z2yqSb3hq4cwfD57gomQslCNcwO3Mkf7Cmxz4XZhy71IS9vO2aLJlGj9Is+BGx3j3iEzK2J3ixj9lT+LQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; 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=KGHKDlu7iTW2jC9AZauBYtxtmV0PjeCY5piYfD0f3VE=; b=lXGkFcvB/DfqwhOER6VY5osK764dtnoTIGeumtzJfhu59LFAB6iuvAT5BNB/Lg+M1f7LgHzFAj+mybMKHLFMVnD8WQFLzzA7+N/auAGk9QJtMxaw/D+ASXMyEdohvzf2h2kdfIQz8gp7gYSB0hBLe1MU602Kw2LggUvCQUE0beI= 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 DU2PR04MB8536.eurprd04.prod.outlook.com (2603:10a6:10:2d7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.32; Wed, 27 Mar 2024 13:11:16 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::d30b:44e7:e78e:662d]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::d30b:44e7:e78e:662d%4]) with mapi id 15.20.7386.037; Wed, 27 Mar 2024 13:11:16 +0000 From: "Peng Fan (OSS)" Date: Wed, 27 Mar 2024 22:10:46 +0800 Subject: [PATCH 2/6] serial: lpuart: use ipg clk for i.MX7ULP Message-Id: <20240327-imx93-of-v1-2-afab6b31422a@nxp.com> References: <20240327-imx93-of-v1-0-afab6b31422a@nxp.com> In-Reply-To: <20240327-imx93-of-v1-0-afab6b31422a@nxp.com> To: Stefano Babic , Fabio Estevam , "NXP i.MX U-Boot Team" Cc: Sumit Garg , Tom Rini , u-boot@lists.denx.de, Peng Fan X-Mailer: b4 0.12.3 X-ClientProxiedBy: SI1PR02CA0048.apcprd02.prod.outlook.com (2603:1096:4:1f5::11) 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-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|DU2PR04MB8536:EE_ X-MS-Office365-Filtering-Correlation-Id: 216b5eb0-c3f5-461e-22c4-08dc4e5f626b X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sE8WMl00Bi8xQmg+pg7FCO+pGmUtrXDgcYMIJIeCRRDxT58kP3siCNWXFMpKYfYIeCEG+0mazkLRHWMiElSwu5OLFVjsUr+tZqWZuSOnB+if/8NMiw/KOjvKfoQ5kzCyKXPoAvzVqW5Tb+ZFgE6tggFHyeHMAedToyrK1GUo9mnNy8FH9Xzbq1f1R49x7Jr80eShqBuDrvBh7D8RwyA7AuUNBNzGvp2/mM7gJ5i6/iDZ1HVMsJMGEXUoLbq142p1Wg5J0nSf0ESj1OtYZvMEpzeJyf+YBsTVdMtN0KgoG2hcP5U7aRBqG7E4++iLyfl4Kb9du7azr+7yB/TnxiDDhESpJbC84iKbFIjPR2oqyOntttI8FgrinIK7wBDEspx5cRxIF0302pdJJ+9Vgs/8uNV/MN8CdZi05iNX3C6n/X/XBGu3nWUTxigvFIQiupWBmmfyiEGlh3nLpczrXKWbTJtRonV1Ja1gZGXwtJj2E31Uj1R9IXntfj5lNc3zdCivRRmf9lFel45ijvP9veEke0+AGCM/12oDCINg8mw/L34izOaScQsYY+5KVVGEEcR1uWuXfYH21d+ECiwKivcLZdoPRxw4SSmw2Mz3745AyoJFLdIVXpZs4tpnvrPeyeZD/71usKBj6g2zU/txFppfJMT1CCnPhGNcGFMHbVqymK6q7847z8agFtd/u0HiQkW0k2geOqKmTSQyIpgNLFHjIQ9cf8ZVsjio2WMuZ/1WCXo= 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:(13230031)(52116005)(1800799015)(366007)(376005)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?l5YbGUVWEkzy38nJdYKaEXRsZfJe?= =?utf-8?q?8CwGqt9BRCYoVpXmfquljyBkiL6SU98zabGWFDpde7ZDPlUvGWpPAAy7Ru3c9aAgZ?= =?utf-8?q?rtpoZrd72FfcBwkrS2GNn4puqq2GNrdrjgBJ5cA29qiXmk8FA8vOptvUNp3wKjUhu?= =?utf-8?q?OW1XK5Njx5uGHnGNDkbq7YSIkzeMnxZvza8P3nbbqPIyj0wPaCdwqZl4zN/VAOpHM?= =?utf-8?q?Y4rJezRvi+FJXWKUxwB28YTwZxguYNaKEr6ePUCPhilA/yv7V4oIxHro8/acuuQ/r?= =?utf-8?q?6tWMYkx4NAu9iCSdwSGmu2WL9vCFlYWGTD3KAc04AXEGGpJ5c1g5tppXfDSJleGzc?= =?utf-8?q?t/ZEeySo/EwBfEbolPYYK+qIkUMzESRWDoBWAgU6DQhudotdkMyiqt59RDwWzkmJy?= =?utf-8?q?iiHGRLDr3S2t+eK9uqhTHhEnomVhpOin+uCNQdREzCqeTURxhS2hYVr1Owg6Kseqx?= =?utf-8?q?KzvE90YIBbFsLxvimDTFMnCmvssRSmfAwb18Y9GQSTXnkgrqp3N0vxRabu2j/02pj?= =?utf-8?q?faR6BfpyCI3Q7qfJsA3FtMoQT86SL+q0dykKZQ4ZC1RFfWlAT6HCzp2rCTA4YaANu?= =?utf-8?q?RwvvwTUTWO8HM4s1hcrFAzvbjQmjQT7J54hjKYxgt0HGFpQrkIpAhGJqIwMyBDDYX?= =?utf-8?q?kaNP/ii8T6iv4hgF51lKNHQtGMuhQmhfHKgo/nPs5aKG0XejUn23DzmMM3taDO39Z?= =?utf-8?q?0cNAuadE/lDKVblLQ58A0K6d96Gr/mx5Sa4bRq6b7XS9BzZ9wKsJLSggkyHh92zS3?= =?utf-8?q?IxlzW/i9xnMMS+PvKS3LWwfwVLASErBdXX9ktPv6Y8DSS1G/wBBWRCEKA6Kbz78XF?= =?utf-8?q?StSgETd5vubm+O7m9KJkwb+bjI/QCuM69K0qcu9KhTH7ywcxykYt2kR76rYBqwGRu?= =?utf-8?q?iL+28YFb370dyT+vbctScWte2k+4DuhjnB1yjFOxMzekBgr+FsJnL7unq8Vfua/OC?= =?utf-8?q?JBw3QkDnDjZpdwWFEheNxt8Em4nQ4/gB+/bJZdGDfyc5DJSuM+S8qUhyQzzkFsqW5?= =?utf-8?q?tJzymZ9AbS76VfyKGX6VOqarYFbRSWiRPjvdNXaRBQExBF/7oO3dichhd4PZhqvOb?= =?utf-8?q?/O1LPnmIVoYLXsoPSz/bnoFP4B7AxSfNvJbYmPYGXrbIeQ6Aery8/sTmzAB/P03Wz?= =?utf-8?q?oGxL7J+GuVX2kzuRUG3nLwnJGx6jOVpGRFezmzzPHIRgHPC7uwS/cooJbeq6UJTk/?= =?utf-8?q?kfNvNT9/1m+ZAeexyYWkrir7vZiYF4pw9j2qwMEJEUMdWo0s0ICazkMR0paTeETBU?= =?utf-8?q?oSlmWhc92vvWtqUFsEgiDfAvCWP+1iD/oh5MPa61RZIFKj9RLgVFyztTB8LjxnaJn?= =?utf-8?q?jwsB3hRzNxu4YieLNF8rdzoWpQdPs4YjuwMHlZYWENcFeSyOtJMFXG7XKsBFObFfC?= =?utf-8?q?iqiuTHZ8YBlzw8fhPB3WpeY7f3cRBnI2q1AvCGg/KEz48KHycfWWb4x/MR7W1n2Qe?= =?utf-8?q?v11TXMkf2w+Vl3nhLNvIFl457tCThxtXmL+Jn34kSC+4x5pfD8K2I4hCp1IZ3xdfD?= =?utf-8?q?ZdPrVjSAi02u?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 216b5eb0-c3f5-461e-22c4-08dc4e5f626b X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2024 13:11:16.0963 (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: WoEunxT+DCK9FjAWg8nUECoOHCxotBdstTdGr2E9JK72APXruyMyEY08k0xhIFnw7DzNrQRnN9jor82Gan08Aw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8536 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.8 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan To i.MX7ULP compatible lpuart, there is only ipg clk, no per clk. So add a devtype check for i.MX7ULP. Signed-off-by: Peng Fan --- drivers/serial/serial_lpuart.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index ce08a6b4486..653ff99e67b 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -111,11 +111,18 @@ u32 __weak get_lpuart_clk(void) #if CONFIG_IS_ENABLED(CLK) static int get_lpuart_clk_rate(struct udevice *dev, u32 *clk) { + struct lpuart_serial_plat *plat = dev_get_plat(dev); struct clk per_clk; ulong rate; int ret; + char *name; - ret = clk_get_by_name(dev, "per", &per_clk); + if (plat->devtype == DEV_MX7ULP) + name = "ipg"; + else + name = "per"; + + ret = clk_get_by_name(dev, name, &per_clk); if (ret) { dev_err(dev, "Failed to get per clk: %d\n", ret); return ret; From patchwork Wed Mar 27 14:10:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1916756 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=JOVnXkp6; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V4Rs16V1tz1yWr for ; Thu, 28 Mar 2024 00:11:49 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8983E880E4; Wed, 27 Mar 2024 14:11:25 +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="JOVnXkp6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7DF3D880E9; Wed, 27 Mar 2024 14:11:24 +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.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20630.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::630]) (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 913A9880D6 for ; Wed, 27 Mar 2024 14:11:22 +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=L5iiJe52jMbEknmL0h3yBl0N2C9uQB0kmPp924wX829S8jia0WetzYN94vGvXW+wOMscpHL47dc6PRcDVv3JTyQ0r6QJb9uNemwnOn0vKaFM4hctMirQZQ2QoOYJ766hb1i1kyzdUFiXyJMQ3r29C+fI+L3AjvC6CLbpum/yyfiP3Eu1QAjp/8YmxDn8EfrCGwMZHTvsmKXfDHghpCyCSszpCa1D4dLuTHwmAPwtpKmBC5dLSntHytB985gjRAj7cTIXa9bsNcXYEfR/VJ1EP31nviADtndGldOFyerfqL4XzQsmFU5SQyhG1u1B57Q1bs9uzI3wxwu09qHi2jqXZA== 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=xw5jzwTIPCMk/iOdv7f42gq+s3I8TPPWND2qNjv1UIo=; b=WAVhA/kdU2Ude9UZ84IfnFY6M8mOMmtPx9gJC8RAVG7fQLT3KRENz7qFR/N2cw/ELeotLTABwH/dWht7LuAMqp5UMM6PIMiHiFtXTBLyPTZnYawhDTnhlNKhfTYGjbWonf5laDQ5rMlMLPiWGAKX2YZt5eAbWpWv9TEAmCPIoFF2Oug9qgWh34u2SkaiE1lxb3/C8okqqvkAal6mTsPqJ0TGYD2wmM2uJKpYhvza8FWUg8F1XAyhgueOpguSjymfwsPgZQVXaszHxH6mk7S1oIkfNjaYsbbjIDxFdfEQvv5JiPDswdtn+yMco66BxykRhQwD2rlJiGlfBxAXchLosg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; 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=xw5jzwTIPCMk/iOdv7f42gq+s3I8TPPWND2qNjv1UIo=; b=JOVnXkp6e4o1ecXcub71mrnc7FLJQwfopqLemnASbLg9XytAEOFxetv7NUDVLb0v33a8KFHIGHtTwSLxpRsRxuNkZ0tfw8I34I+FitYyfQoPKuqNb1sRUHteKavG/AyEe/jJgDQJL5gdHC2wvYfJNNXK23iHCofEQAZOoYM3q4s= 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 DU2PR04MB8536.eurprd04.prod.outlook.com (2603:10a6:10:2d7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.32; Wed, 27 Mar 2024 13:11:18 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::d30b:44e7:e78e:662d]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::d30b:44e7:e78e:662d%4]) with mapi id 15.20.7386.037; Wed, 27 Mar 2024 13:11:18 +0000 From: "Peng Fan (OSS)" Date: Wed, 27 Mar 2024 22:10:47 +0800 Subject: [PATCH 3/6] cpu: drop imx9_cpu Message-Id: <20240327-imx93-of-v1-3-afab6b31422a@nxp.com> References: <20240327-imx93-of-v1-0-afab6b31422a@nxp.com> In-Reply-To: <20240327-imx93-of-v1-0-afab6b31422a@nxp.com> To: Stefano Babic , Fabio Estevam , "NXP i.MX U-Boot Team" Cc: Sumit Garg , Tom Rini , u-boot@lists.denx.de, Peng Fan X-Mailer: b4 0.12.3 X-ClientProxiedBy: SI1PR02CA0048.apcprd02.prod.outlook.com (2603:1096:4:1f5::11) 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-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|DU2PR04MB8536:EE_ X-MS-Office365-Filtering-Correlation-Id: 6b4a8dcd-0a7b-42a7-1948-08dc4e5f63fa X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f1Nh1BmdPfdCrYCMtvOSYbIUNRH9wK7/PdXzAcpj7/6LyvK05JMar5I3FVMKpFU/uNgJqqYX2jRjlyiwoPx+BxOcl7gwn1IpErr5nSB+Smva0AMOB0tB8W7ZL8HcerFE9WQN/IxU1dsxxptWF0cSh6MuQYam355FQ7QhiTCwLqrNzJbXo2T+iN2nZBPwq+xVciH7oRF1ixjSGqElQHSopmwnEWLoSsNVNz07i5glUZM+U6VyiCyJg+oKhYEZc9zpLF4TI46LQNQ0j1ItWY/dyQCS0kr0+RmM93wmmBwSwzuxymkjzu/ShfyuB+fUZkq6vymu/nFt4uTI2g4Pu5R9G2v7REx2UizI8PDdb1hbMBjw5UJ4iWvrCncEAJPBmtaOrG/z+ilCEFpb4yYHHjLkfnBYXl+6t4h9AWWm1q+/TVyjqGWhqiOFgOZgQEVtRznavX6t0pCguXQj+WxyfszCdgvuj/L0w2493mPvuSpfg5E44MndFYyHi6Pa1RyEVjiiGKdj021aOtkRKrimZ1ronyszjwyX6WLzTUDq29HxTnYP70u75rVsf61l6CoP6iDEeGOgTJJtGnL4ihe22EMVcxJNWBAwuS4xXRjFU0l7/hLBztQ+NA4R1MmWRS1u3MiChFMkXLH934aTdjviBaGLymfM9TtEOL1uxUwjchbnz5+BK/FTOAEnKMrZ1d9vGj3FUR7Q/TmqVaksZpJiz+6ho3340Ls17Eb3fxzU/o1wEgs= 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:(13230031)(52116005)(1800799015)(366007)(376005)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?0URtsULUTrjE1SXVfdlPM+doWO/7?= =?utf-8?q?9Iv8u2sK1qbCDaO2nKofx0bBlqvGYKfKmV2sgUj6MopnGDjozOH3QYoKihVT4xOMr?= =?utf-8?q?TKYSg0cIjQJKNgLBAXgTtoGZ8S1idMi00aoEmafVR/sGBwozPxQXan7nrG/J5nSGu?= =?utf-8?q?4abQy38nQh1nqQLomnDxz3ybJ3j0NrHeUM3ZT9JcW3IQ/34h3vmHsBU+ukaXqMpXB?= =?utf-8?q?A77HymtPb328Wd1v4pO3/v6SaO4cBtKKl9dCMF870EjMblY3zEZYsZkJAlTCPZ8NV?= =?utf-8?q?vksB0pbyJsk4emq3hDYU5Z7lIi4SHlUaQRpojcosIOftb9Raz7NXm5sgbWTqoztsn?= =?utf-8?q?XqCtSYR5S7zLsDKychEkxB0/QN0Vx1D5GU0dJ5xGmuOM5AxRFG7mXZnpUgPZ1/tRQ?= =?utf-8?q?xWE4/czxKSiQ8VD6zLOC1ODG5rz5J+3m7ElMxYKVyzIGLbv6lBwTaWyv5Akc1AfUM?= =?utf-8?q?Dha1gcf4X73PKUtPEWaCEhUf+Tcm/zXH84wVPZL5Mx61xRziS0SjvdO7xJAMD/LDz?= =?utf-8?q?adZfCuW0HuHMGV1toYDEsitUkWbZUbep3KoZxRrfh7703m6lbPlQL43e2OBAvbgfY?= =?utf-8?q?csJ4xBraB26s8Q/4a6ZGXaQ5tfa3nhsOUMDnfJqBpLEiXIMFUW8kbXDeYF6C90IkL?= =?utf-8?q?ZTsboELGEuXgH/sLwbl+C40Y/YzGioW4m0smpg1FtUwV/KOMx+tXrbn+Bmv/vABfS?= =?utf-8?q?gTWZfvv8O4DnJld2vQnTWGr2X8ZOxRNxz9s1ENq9B8W6SIc/eZASyBCNScWw/5Uuk?= =?utf-8?q?r/0nvf1Uf0ajqXVuJ9RSroF9T78LWOzguw8dfJP1bNa8uyOz5UimIwSrPZ68N5VLx?= =?utf-8?q?ZmrpvSbgd5b4hpAR1Bjl7tLLSoOmSkNHxNR553nY4/q4JZLSWOCZ4/vNs7hHKE6QL?= =?utf-8?q?7fjc9yF4BtLCUhJqalp1/Qi9inMtS+a0MmADN9pVnO1ilBWnwZ7Dp09W7kfrUJ+HF?= =?utf-8?q?r71lEOmUTfL37bZlkiUOjuZCPa7Rb6oMz3/WvUERuRvjFdDq0x1ZkGyj9lDp5KCrf?= =?utf-8?q?wHwodu/4H745hac1BJ8jeoX93wUWpH3h6wDTd34TKLsijJKBe+/C4YCx2R02Wau+q?= =?utf-8?q?7wiYM6JuJzlou28iwnoYBieXXIrWgFWKAYgsaX1puDl+mGf4D5Ueg4t1vrT4vL0af?= =?utf-8?q?9f3G5osG4lTWvHJq56d9JVYLmUlW+dpIsZsm/UVZwVflyrAgJEqE0WIY+UmOn3lX+?= =?utf-8?q?zBgUtVCnQSR80V4X9YAsB79gF0eb5N9VfQIPboLu90D+vqR4QTPs1ZzlT30k28/5f?= =?utf-8?q?0ahtEuPP9e50vs3EMlRigDYEAXGz2m4WEnRpgKoV6z9fSEBRnBXfbD7gRNpa2koN/?= =?utf-8?q?lQDkH+zN/RE3QyMVCWjaDgR6stoEf/MlqqHIm7xVpB+IX7wX6S056NOKhrIJ0EZLZ?= =?utf-8?q?q06omJvzjBcCJxZlBW3voInV/vPyF8XHQOCJ57idy45sYWpOcKD/8WrkqxIgwADdN?= =?utf-8?q?08+NbPKgvTT1Znmv3fyWiuSIQXnFMqWM6Bz3NUv8SV7Q5XGiqX75dICqsZRVW+gVH?= =?utf-8?q?hlU3CUeEgw1R?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b4a8dcd-0a7b-42a7-1948-08dc4e5f63fa X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2024 13:11:18.7052 (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: lT1iE+v/NvdCMYidW0kleY5cz7cwf93o6vp0ukIMHNGLcfOj068kvNQkLOA3NWBZnDBoza6cZmeYd6btmJGuuw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8536 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.8 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan This was wrongly committed, no user, remove it. Signed-off-by: Peng Fan --- drivers/cpu/imx9_cpu.c | 224 ------------------------------------------------- 1 file changed, 224 deletions(-) diff --git a/drivers/cpu/imx9_cpu.c b/drivers/cpu/imx9_cpu.c deleted file mode 100644 index 66534fe6d17..00000000000 --- a/drivers/cpu/imx9_cpu.c +++ /dev/null @@ -1,224 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2019 NXP - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -DECLARE_GLOBAL_DATA_PTR; - -struct cpu_imx_plat { - const char *name; - const char *rev; - const char *type; - u32 cpu_rsrc; - u32 cpurev; - u32 freq_mhz; - u32 mpidr; -}; - -const char *get_imx9_type(u32 imxtype) -{ - switch (imxtype) { - case MXC_CPU_IMX93: - return "93"; - default: - return "??"; - } -} - -const char *get_imx9_rev(u32 rev) -{ - switch (rev) { - case CHIP_REV_1_0: - return "1."; - case CHIP_REV_B: - return "B"; - case CHIP_REV_C: - return "C"; - default: - return "?"; - } -} - -static void set_core_data(struct udevice *dev) -{ - struct cpu_imx_plat *plat = dev_get_plat(dev); - - if (device_is_compatible(dev, "arm,cortex-a35")) - plat->name = "A35"; - else - plat->name = "?"; -} - -#if IS_ENABLED(CONFIG_IMX_SCU_THERMAL) -static int cpu_imx_get_temp(struct cpu_imx_plat *plat) -{ - struct udevice *thermal_dev; - int cpu_tmp, ret; - int idx = 1; /* use "cpu-thermal0" device */ - - if (plat->cpu_rsrc == SC_R_A72) - idx = 2; /* use "cpu-thermal1" device */ - - ret = uclass_get_device(UCLASS_THERMAL, idx, &thermal_dev); - if (!ret) { - ret = thermal_get_temp(thermal_dev, &cpu_tmp); - if (ret) - return 0xdeadbeef; - } else { - return 0xdeadbeef; - } - - return cpu_tmp; -} -#else -static int cpu_imx_get_temp(struct cpu_imx_plat *plat) -{ - return 0; -} -#endif - -int cpu_imx_get_desc(const struct udevice *dev, char *buf, int size) -{ - struct cpu_imx_plat *plat = dev_get_plat(dev); - int ret, temp; - - if (size < 100) - return -ENOSPC; - - ret = snprintf(buf, size, "NXP i.MX8%s Rev%s %s at %u MHz", - plat->type, plat->rev, plat->name, plat->freq_mhz); - - if (IS_ENABLED(CONFIG_IMX_SCU_THERMAL)) { - temp = cpu_imx_get_temp(plat); - buf = buf + ret; - size = size - ret; - if (temp != 0xdeadbeef) - ret = snprintf(buf, size, " at %dC", temp); - else - ret = snprintf(buf, size, " - invalid sensor data"); - } - - snprintf(buf + ret, size - ret, "\n"); - - return 0; -} - -static int cpu_imx_get_info(const struct udevice *dev, struct cpu_info *info) -{ - struct cpu_imx_plat *plat = dev_get_plat(dev); - - info->cpu_freq = plat->freq_mhz * 1000; - info->features = BIT(CPU_FEAT_L1_CACHE) | BIT(CPU_FEAT_MMU); - return 0; -} - -static int cpu_imx_get_count(const struct udevice *dev) -{ - ofnode node; - int num = 0; - - ofnode_for_each_subnode(node, dev_ofnode(dev->parent)) { - const char *device_type; - - if (!ofnode_is_enabled(node)) - continue; - - device_type = ofnode_read_string(node, "device_type"); - if (!device_type) - continue; - - if (!strcmp(device_type, "cpu")) - num++; - } - - return num; -} - -static int cpu_imx_get_vendor(const struct udevice *dev, char *buf, int size) -{ - snprintf(buf, size, "NXP"); - return 0; -} - -static int cpu_imx_is_current(struct udevice *dev) -{ - struct cpu_imx_plat *plat = dev_get_plat(dev); - - if (plat->mpidr == (read_mpidr() & 0xffff)) - return 1; - - return 0; -} - -static const struct cpu_ops cpu_imx9_ops = { - .get_desc = cpu_imx_get_desc, - .get_info = cpu_imx_get_info, - .get_count = cpu_imx_get_count, - .get_vendor = cpu_imx_get_vendor, - .is_current = cpu_imx_is_current, -}; - -static const struct udevice_id cpu_imx9_ids[] = { - { .compatible = "arm,cortex-a35" }, - { .compatible = "arm,cortex-a53" }, - { .compatible = "arm,cortex-a72" }, - { } -}; - -static ulong imx9_get_cpu_rate(struct udevice *dev) -{ - struct cpu_imx_plat *plat = dev_get_plat(dev); - ulong rate; - int ret; - - ret = sc_pm_get_clock_rate(-1, plat->cpu_rsrc, SC_PM_CLK_CPU, - (sc_pm_clock_rate_t *)&rate); - if (ret) { - printf("Could not read CPU frequency: %d\n", ret); - return 0; - } - - return rate; -} - -static int imx9_cpu_probe(struct udevice *dev) -{ - struct cpu_imx_plat *plat = dev_get_plat(dev); - u32 cpurev; - - set_core_data(dev); - cpurev = get_cpu_rev(); - plat->cpurev = cpurev; - plat->rev = get_imx9_rev(cpurev & 0xFFF); - plat->type = get_imx9_type((cpurev & 0xFF000) >> 12); - plat->freq_mhz = imx9_get_cpu_rate(dev) / 1000000; - plat->mpidr = dev_read_addr(dev); - if (plat->mpidr == FDT_ADDR_T_NONE) { - printf("%s: Failed to get CPU reg property\n", __func__); - return -EINVAL; - } - - return 0; -} - -U_BOOT_DRIVER(cpu_imx9_drv) = { - .name = "imx9x_cpu", - .id = UCLASS_CPU, - .of_match = cpu_imx9_ids, - .ops = &cpu_imx9_ops, - .probe = imx9_cpu_probe, - .plat_auto = sizeof(struct cpu_imx_plat), - .flags = DM_FLAG_PRE_RELOC, -}; From patchwork Wed Mar 27 14:10:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1916757 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=kjH3WueJ; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V4RsD68mnz1yWr for ; Thu, 28 Mar 2024 00:12:00 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 099BF880AF; Wed, 27 Mar 2024 14:11:27 +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="kjH3WueJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3EFF48800C; Wed, 27 Mar 2024 14:11:26 +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.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20630.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::630]) (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 54416880AF for ; Wed, 27 Mar 2024 14:11:24 +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=HLo/d+zn7qsW7woV1gKSxqSL88eFamTxaI+XrdoRv0/9clIHVr1eAXHu0G1ntmmEzBcM+hrvFtHE4ivaUEjLg4Zz1sSlBAMg2rKLezgLzbzoAQNNQvT7Np44tCUVlLq7zEOAWgIqOKAo+XV8aW73rbIJVR1RE/Q+3shOOV1cyvbG9EZxvWG+cJxtgXWDEwvNTsnma1NDZbRg54XhMdzwrlhxlk59hD9iKmDICwjb1NOA8IPAV5Mfsmb3uOrv39PVed7elvHsaz9yLnJox0YGqmNMR7dIOC2mq5dwRwb3Q/JOVmDi6iGZxUbHg8RlFS4qy9FrHxQ/rUY67V684bV7/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=2apRpJ7rgh6shHzqqLbCaAC+wmcq2NUoYjF1/VDY0b8=; b=PH/FTgrw1V1OJ0F+YAzsSr34pZZy5TFSZL74oxRNSa3Q0Icikf9YHRwl/5juxRMTTnlSht8O290tNc2IJFpRwjpT9oBWWUc0nhgM44XPh8t3vA7Fp/Svq7Q2QtDZp8sWAYXVW96CZcfqzeVhN+9wsrtQ1j1XYyLGBiM9Rb2voBnVs3HJQZEpYKOzTUSTug9aeXl4Ak6+QocnXRlpRwwTeEj5OTfxErkb/uHR7KmRqXfdU6hGkexhuDmuMYxCEFXyXXRT0rzdlgNOewDhyfRYGmj8C4pJAOHDXWNcgryCFjWvOAnJB7KfqVGfsVcYGWYPEFSA096EaCdpsJ6wTNV00w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; 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=2apRpJ7rgh6shHzqqLbCaAC+wmcq2NUoYjF1/VDY0b8=; b=kjH3WueJyrPN7EesV+6H3gRdWCJ8JD4EmcCk5LeLdKp7gbK7SCn/cottM1uLB035zG8YBQt0MwTLJ74iKqBk1MJWQwLiJNeg6OIVEeyJtbAgXTtSYTiCncwQVuMq4JY9WTKgNS7HefLh3TODZI2CnAUYNM/w3aIj5PMoZi5dywg= 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 DU2PR04MB8536.eurprd04.prod.outlook.com (2603:10a6:10:2d7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.32; Wed, 27 Mar 2024 13:11:22 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::d30b:44e7:e78e:662d]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::d30b:44e7:e78e:662d%4]) with mapi id 15.20.7386.037; Wed, 27 Mar 2024 13:11:21 +0000 From: "Peng Fan (OSS)" Date: Wed, 27 Mar 2024 22:10:48 +0800 Subject: [PATCH 4/6] clk: imx93: fix anatop base Message-Id: <20240327-imx93-of-v1-4-afab6b31422a@nxp.com> References: <20240327-imx93-of-v1-0-afab6b31422a@nxp.com> In-Reply-To: <20240327-imx93-of-v1-0-afab6b31422a@nxp.com> To: Stefano Babic , Fabio Estevam , "NXP i.MX U-Boot Team" Cc: Sumit Garg , Tom Rini , u-boot@lists.denx.de, Peng Fan X-Mailer: b4 0.12.3 X-ClientProxiedBy: SI1PR02CA0048.apcprd02.prod.outlook.com (2603:1096:4:1f5::11) 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-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|DU2PR04MB8536:EE_ X-MS-Office365-Filtering-Correlation-Id: a7cc7db4-1ea2-4e04-26ac-08dc4e5f6586 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AdbD4r6V6VpoBKDP3nZ9L3Ozyg5dPihxWj3KP54cyNt1POhT68U8uTJmoe7fnm7fpgWDf3hN5U0smga4I4rekH6siepnYcxuAeTuFkUzDkPCIKgAsEoK4F74aghBt2lQBLz1GDgeGBBrCC+WgrZ08fccEY81M17sYP5hdp4+oP4NHE0LTxbIlAi1vAcbY3SayDKMRsMgLqvcSiAmHwQoP05M3902C0q6AGmV2c4EqQN3z2gqZIigJJI3RTqk2lx+CAh3ADUh5tNDtFcqNhJV/NHiZ42K93gtJPK0xhg9QKZJ5aJm9rcuWbfYUwS193M/SCpE8nUXSHer7L4XGakvn/YFEkjD1X9Eeu3LKCgE+i6E7goxdyVnTnZrh1wTjjj7R91tZCAVxZ5VpstBn/6Onte2hzkkDbcJQA7YE6BCFKgNV1X+c/XcGecSWOfUxUdmJ72l65u1OyFpqxeFQSMp9vnuJBFUHCZRNipSSXssdm7dmE6fuUWU3qWsSZhC0V3MJ4WPxH52/5gzQS7wXaoFCVlLUTv5hxB0N5DAuShVG08hCTVvBVUhqFuljOBEvRFY8J5fupkZxOb1nYj6aj5yAErwHCWMYtpgio5dQc7sXtDXV9gQosEmMEbdo/vVM7K9RyH2aDEHsLtE1Su8rw7cC12wuXNOBW3yF7wo0qHIxvtkCB4t9SlXquM84/UgtyGK0LvAuyRQgDbqy7ugWRf19g== 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:(13230031)(52116005)(1800799015)(366007)(376005)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?15HUU/3pRK7zXjOamKZZVTN8ObJg?= =?utf-8?q?QNGQzPcfDroiEUQOFvj5sf3Smu6aVOD5KrtHLgYSld4/VHLHEakVnI5dFeXgTYAEk?= =?utf-8?q?3HNqRjcau9vYMQUcnfZpDrMqGtKXeoxZ2HUxd3xD3xurKvyXBf8JP12dfhCXqdm5Z?= =?utf-8?q?1O19XbcrlwV5M7H1ljHS1/zs/lnu40lNtTqLMfO9eHZC6fz63TV8Hq9E1Y/aywfLt?= =?utf-8?q?TFY2k+D3nniOO6/GD57W+gO6gCu6DPlLVCeR155cfl2HDbbxQOq1oQeUxiafy0i0f?= =?utf-8?q?GKR8d8ilj+Haz7pJUx2Ghe3/THcMs4s7FDurMU16jg36w/C5b3wLsJOUzuochKVQK?= =?utf-8?q?M7bMoVc6QVrInbUtuzxhaZOm4DM6g+XOMqHrIPSYcG/z7dSJmm7KuYIbqPfteuN4X?= =?utf-8?q?XPcuKexfccVZ8LO/LupHflJ5jzn3aVnA3vDlPOS4SQw6RLzp7oFXWboDVrRTsto2H?= =?utf-8?q?kY7IjobLQZO0Bsl+qJMEks0J60cUhwc/BAVR3/gxbTle26Dft8tax//NP/PmvYiHc?= =?utf-8?q?JVBV5xSpthqjoGEqcE8jRRXCpHS6iSDOb2DjGhsClUoqG6cI0k9QV0lFLTxz4bxYF?= =?utf-8?q?/tEzQw8gb0+7MEUSFwetJ+Fgp40TCpxaxGz9CmIgt08zyonFmJ+tuXZpXjef4rNVV?= =?utf-8?q?2PSL1jCWHvJL6oQYQ2VQxWoI62+OYxH1lxHkzTuZW2A4Y+OrYAkLc5mtBYLS7IfJX?= =?utf-8?q?fX54cmgWilG19V3sk89OQikFE7lv515gLjP3bMjxkgPQZx7L+3beh8cNdk3qvPExm?= =?utf-8?q?Y4IP+j8ni7wkMpQg86KKY8KUG25/4aYQ6nAV//uRYJ7TgX/E2aiKPnNY7jywvgosu?= =?utf-8?q?09t3MEe7Fgr2YGbPxts5qqy31iHbUkZksHuVTRuPVGN6q2i7N60ziNxr0412D6fpQ?= =?utf-8?q?sH5ya70OBieH+VrSMjs55AguUAq36MG3rYhDDV10r7ITvi4t0EtWFh3VszAe2G1du?= =?utf-8?q?uUvJUP/iNM5faIxQLVFDEw1TWgLIagxek3yTEvv0CPWJw27xC8+oNDzEwXyLH4Fq/?= =?utf-8?q?6Mc0YY67G9M+8yQp5/iZoGVkRIV9jWBPBQ6Oq38u53Y4/0TGLA7j4IZQRpL54d2ph?= =?utf-8?q?n2zlTO6SxMl9sdUERyS8fhV3IH/rTEiEuhbcJcWrXKfnMWJyVvBCN5V4hhW78Igk3?= =?utf-8?q?jKkeIwqf47SD8WYnN2Hkt4zxyS6KsbBXvpabkvTjrtJHY2ATx2oOE94QBr5cAz7OS?= =?utf-8?q?B+RtQddV9Nq6mdDIW8uwvtrLxEUVlldvDuHUMJ2P0kOhOG6d914AKgmTgg29QRSLA?= =?utf-8?q?MpT3ClvOfiqU00VeN2auoxqbQwiUc2p3SGrbMYSztO4R/AdzGVcJdPQ11bUgQW6h/?= =?utf-8?q?BVLjUXd2i8H1204CN4onavDI1QCt25aJdVd0TDvai7kJmqmrpsC4EvK6QP6KFAs4x?= =?utf-8?q?55Z/2beknWMxMGOvbtmcgTIIZ51Fc/NFa4YdL+0+gD7D7zv+FdCe9Ne/H37QFp/Xh?= =?utf-8?q?+bU8IXiwdQvbeLZWbVEIxLJbgyzGWT5gyZUb+rDEN/6yEUlFEGjJjQtmXVSeimd4f?= =?utf-8?q?rGvjVov3HeFX?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7cc7db4-1ea2-4e04-26ac-08dc4e5f6586 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2024 13:11:21.2709 (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: R1a3vAM3fw9AwCsxWp3ECuUHTmzKAgDaRe6PpsJDmNeVEN1/wFCb28TfIYJz0aG/9yNE51nv5buUDsUKmk6ChQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8536 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.8 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan The PLL clk needs use anatop base, otherwise wrong PLL address will be used. Fixes: 9c153e46661b ("clk: imx: add i.MX93 CCF driver") Signed-off-by: Peng Fan --- drivers/clk/imx/clk-imx93.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/imx/clk-imx93.c b/drivers/clk/imx/clk-imx93.c index ce10d795316..f0cb797d975 100644 --- a/drivers/clk/imx/clk-imx93.c +++ b/drivers/clk/imx/clk-imx93.c @@ -289,7 +289,7 @@ static int imx93_clk_probe(struct udevice *dev) clk_dm(IMX93_CLK_SYS_PLL_PFD2_DIV2, imx_clk_fixed_factor("sys_pll_pfd2_div2", "sys_pll_pfd2", 1, 2)); - base = (void *)ANATOP_BASE_ADDR; + anatop_base = (void *)ANATOP_BASE_ADDR; clk_dm(IMX93_CLK_ARM_PLL, imx_clk_fracn_gppll_integer("arm_pll", "clock-osc-24m", From patchwork Wed Mar 27 14:10:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1916758 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=QOw8FlZe; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V4RsR0Jn8z1yWr for ; Thu, 28 Mar 2024 00:12:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8D073880FC; Wed, 27 Mar 2024 14:11:30 +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="QOw8FlZe"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5545C880E5; Wed, 27 Mar 2024 14:11:27 +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.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2061d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::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 647B0880C5 for ; Wed, 27 Mar 2024 14:11:25 +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=AaM0PW8uytLFg5ll0/kT8F1uIvTy+Ri8f9noltsJ1cb3fR4GwjhECz6GdUC/5ZxEjyVmQ1jAexAgxuwg6GP2FaAffO7vn28uf1NaXvpfjkI7WLfzWGbMOjPnSc6af7FQfhk4JYCesZZ5uVfI15teZIl0fY2bdsvuGmJikhE+lT9FhjujGL3Zw2UsMOATC6dUn4dTK1taoW+aCh1ZJwF7agOytQ7Xwu7Tzzxzc9QgbIEDfcyL+BiGTXWrOSPLfc7y1bZTDWfYP2jz3sNrV5ISHheRbV+U3iqZxJPbjkn6I31Ckh2x4tsljoAoJTVm+4nWf5qDVyJgYCJxz2v4rfb8WQ== 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=vw4y8Ys3wAi+rzm+Lf3dok1OxP9lf9H5DAZdqsN45Xk=; b=ZmjmoNU654uyoPSXMhgjCjezAzmMC8drGWzG9nONXBVmdvQ2UKFW9k5fEcx5go7US3Y1gOOG9CnU3fPkxpa09rdm6Zb/x8hj5D0Cm35/l2JyOHGCXRJ+TWzgzQbIqn+Fd0tPiBelpCmpzYj++TMvVhefOyrg+wGCHgghOlEcO2vhXWJfB/9iUe3HnTW2zX0KW6fDYdJQhxTHjyXIVyi1PXpHbwWJYPb1QS6Z/2KJzDw5sbiJaSZGLpASHyfCgpFUNUcu5OGmFGAKX1zakkQm2bBxqbKx3eWsxnhI9vDRltywWiUm3xrUd0wLwWenjvgU2+GLIAxYMJ0yhv0eNgZ4Iw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; 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=vw4y8Ys3wAi+rzm+Lf3dok1OxP9lf9H5DAZdqsN45Xk=; b=QOw8FlZelDqmF4PkmSD6kFfQI3lGEnH7krfAE1icBVrTS97asgxzA1SU6K2+lxPxAHtSjHXO0KX/ZREyRVr9sdaNILbjigk6YdITWLZbHv6M1tRhTon67LK32GDni4fUVwoXvA/H6ifX9O9h4hhxwqOsSCk8CdYZYdok83GbxX0= 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 DU2PR04MB8536.eurprd04.prod.outlook.com (2603:10a6:10:2d7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.32; Wed, 27 Mar 2024 13:11:23 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::d30b:44e7:e78e:662d]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::d30b:44e7:e78e:662d%4]) with mapi id 15.20.7386.037; Wed, 27 Mar 2024 13:11:23 +0000 From: "Peng Fan (OSS)" Date: Wed, 27 Mar 2024 22:10:49 +0800 Subject: [PATCH 5/6] Makefile: tune the include order Message-Id: <20240327-imx93-of-v1-5-afab6b31422a@nxp.com> References: <20240327-imx93-of-v1-0-afab6b31422a@nxp.com> In-Reply-To: <20240327-imx93-of-v1-0-afab6b31422a@nxp.com> To: Stefano Babic , Fabio Estevam , "NXP i.MX U-Boot Team" Cc: Sumit Garg , Tom Rini , u-boot@lists.denx.de, Peng Fan X-Mailer: b4 0.12.3 X-ClientProxiedBy: SI1PR02CA0048.apcprd02.prod.outlook.com (2603:1096:4:1f5::11) 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-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|DU2PR04MB8536:EE_ X-MS-Office365-Filtering-Correlation-Id: 3a8ec0ff-5a12-4674-63b4-08dc4e5f670d X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eJlnbeAZ2HOt44k7M+P6FXH8FblA3y7V9Ie6PMA08VzkHHZbnpHJHZh3B0YbnBGGJ8DP4SG9zKY8rM3g2Ksj7S/3Gs0OBsR9Y3AxSUeHB5m+8FZH4RCikJ9GqJdSrEdTibQDtzEBJwKZNvGQrcSSxCtEToReuj2eP5c0uuaZzy5LzfLiGxSs186NWsVeBRtCP50fgI4c53bT11KaK6dIhONnWn4AlzN/TJjrT+lpFW921FFN71dglhN9FHl+KWYRiilWchHmrqsFmdT3Mc15LnLt7cN8yoHtH7D6zlKdnLuqiueSswuro2x8BWKf8Mp2B7bME62nGdekWAfiwVqVbv7PmEJ0lOUcIW1NMCTZf7t6YZby9V6N9/2OIn9sDNdLsUAmM/T/JsXPyBcfye6zt98MPS0cw9BRMZd6DJL5UThjfSIUhRuB4QyQLrEvNIvAgHoBPl0uetbjEa7WppBqWF6EjlO4LVMgsjqG+n+LalNcplz+egBk9/8ptnv1Oo1IPaFYqWaGUY2RUCxMvN+OyIMK+tPB6WrVO1Zep8AVrcElfn8W9Kr0Wq4Bfv0t6fLoYr8KBvKjdVPVYsBQ4485AfjskslH7u+BsHhQY/VQT4s2UTY3bVhDr9cQX9bkGzDUQ/qnLR0At4WW+AWiUXWFcoogiV7xvrr2i78zxYe2MYtQmNdBS6GdkfEExifp+ytSaDpbUm7s2lTGsgT2nCjDQT8h7tEP7gkOOLB7HjPT24A= 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:(13230031)(52116005)(1800799015)(366007)(376005)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Z9PpMblALJppIcGp0hY6ypmZXpIY?= =?utf-8?q?EChZwWLnW3k2IdzmEZWuVCxfdh2gmRA+DkCjGrGtJVcuAU5ssIe2o2l9HY66Lnv4m?= =?utf-8?q?/iVOE7/RRR1VGPFy7mVdeL5xme4Bf3pFuYunUjVZ2gZXyGB1ms6o3kjonIz7IEeOu?= =?utf-8?q?tL7KL8RbvhNWUF2/Sr+iZk/xSNd2MADhmLQW38DP8b8sY/KDautyTSWq4ZJreBm6h?= =?utf-8?q?mJvEtktljrHc4CMOODxqX+NWUZPZcROi4Kw0vspJF5pFNREb+nCHvzwX3j5gNFUYl?= =?utf-8?q?FyNwyjqcvRVvmOmSe1/F1+XlrfJcUnLxIw8Os02sZarKlvDntArl1/0iuJvVS9a2G?= =?utf-8?q?/k58YhtmEDfNqxojpWeYhdLrFhATBNGyi17/U8T2AwHolDQuVkGcRSZ0luI/SpdoL?= =?utf-8?q?rYyqY2ktTK40A1mVUk4dIbWdQNLbZ0VIjOFt95UNhZdvIGt/44WGtCeiIcw5EtBrG?= =?utf-8?q?SEmqWUwjOVFJE47k2mseKsW4grmcAPG6Ldu7daXIetXv+0aU2mOU+pCLpoqt6eFO7?= =?utf-8?q?xG24JK1mi2J3V2VzT/eVAXKjz125o4OEf26vhGcpzcRxGWM9b0AF0mj8ULsZhVUU3?= =?utf-8?q?Ahdi2RnYOGcwAg2oFHDAcGbNC0FD2oGUHeZUKk16+dFpz7asOPnBDtooufmBTD+os?= =?utf-8?q?Ixonll5GhlMhWCABAPdCIt0un3nOL0fuCjOasbi/NFgbVfq+PXm1sqMcF5wuBRtnF?= =?utf-8?q?xWEET3e9YGU+nSAEjEFJRcDznOUgmyuvc+fLY98+KUEYmHPdTN14ZtEVUO0oCxsK5?= =?utf-8?q?8Oh1CzVyZhIu411q98SUQR/qOl7nyE+rnbt67xoacvojFbDg39jDiSQY+RPsxJAYo?= =?utf-8?q?UP6Gv1pUNXabPZdCdK0Ps60cnDvRfX2WrT2G70wzzRkAB2mJQoRjW+pL6ZKXQj9aC?= =?utf-8?q?ffH7aTHyxQ1W7l7BX4b7YzyQbCOi3En4o2wp34Xogiq9FLvm+ZiRcArI+zJthiFZJ?= =?utf-8?q?mNdMe17irVBfPEB7yLBYK4C8oNaVnwdAakFphSNMsXVWL4F+svqsE2DC2mNj1H90Q?= =?utf-8?q?z4IApTlNJGw31S6+hNTBIOKQ30nqt99Uxf+YwZKkZE6SuhqPkH//Rr8WDcGgKxGQS?= =?utf-8?q?E+bcgWL5O14eIwqmXTdJRjExGx/2LHLqe8nbV1UnNh+sBq6KJUMK4EkdCspRMIGvb?= =?utf-8?q?RYfscQKNhGeiZbOomlEk2i/Dmjma66gwI1x//pWz4NFbK8Dt5qDbkakWZprqpsgTJ?= =?utf-8?q?wJdcRfTixG+eHLyhuPLs5/vd0Iv3vGHhZxckIggamdDlD9Oj1pe0C4Zw2oUWnE0R7?= =?utf-8?q?uYGNz9ojmyDG4cB2STxz6xJ9UrH39UNozXZUy1kz4Ki25oHnYesbKgwo9PbC7kjzu?= =?utf-8?q?S6EUw17x44hu9HXzmds0Mfk0l39Vne2GRum7/NvaG8EfM67f9A0JrvFJsLlnJGf5n?= =?utf-8?q?p5zHOGzB/HhvWqhqD3j5hPsPawHE+2zUWhjtLKfrJ1AVA6a/1FNgtcQQYyC/hdpRn?= =?utf-8?q?2BUtlEMYYx63NOkpMateFJXDV7XZndFmWRFw+pUiK3Wkwf8NC1wXh6107OkiPcoEF?= =?utf-8?q?g1eYUl+zrm8+?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a8ec0ff-5a12-4674-63b4-08dc4e5f670d X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2024 13:11:23.8537 (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: qWuwqYt5vV8YTbBFC2bB+u741WDLep+bjkKMjr16E+Y1CgWadgKdGdOFXPxWOmIFAYdYkaZ9UbeLXv+EsTGc8w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8536 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.8 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan For OF_UPSTREAM support, the U-Boot headers under dt-bindings/ maybe different with OF_UPSTREAM headers. So let OF_UPSTREAM headers be included first when migrating to OF_UPSTREAM. Signed-off-by: Peng Fan --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b80924241ec..b9c2d896c2e 100644 --- a/Makefile +++ b/Makefile @@ -827,6 +827,7 @@ KBUILD_HOSTCFLAGS += $(if $(CONFIG_TOOLS_DEBUG),-g) # Use UBOOTINCLUDE when you must reference the include/ directory. # Needed to be compatible with the O= option UBOOTINCLUDE := \ + -I$(srctree)/dts/upstream/include \ -Iinclude \ $(if $(KBUILD_SRC), -I$(srctree)/include) \ $(if $(CONFIG_$(SPL_)SYS_THUMB_BUILD), \ @@ -835,8 +836,7 @@ UBOOTINCLUDE := \ -I$(srctree)/arch/arm/thumb1/include), \ -I$(srctree)/arch/arm/thumb1/include)) \ -I$(srctree)/arch/$(ARCH)/include \ - -include $(srctree)/include/linux/kconfig.h \ - -I$(srctree)/dts/upstream/include + -include $(srctree)/include/linux/kconfig.h NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) @@ -907,7 +907,7 @@ ifeq ($(CONFIG_USE_PRIVATE_LIBGCC),y) PLATFORM_LIBGCC = arch/$(ARCH)/lib/lib.a else ifndef CONFIG_CC_IS_CLANG -PLATFORM_LIBGCC := -L $(shell dirname `$(CC) $(c_flags) -print-libgcc-file-name`) -lgcc +PLATFORM_LIBGCC := -L $(shell dirname `$(CC) $(c_flags) -print-libgcc-file-name`) endif endif PLATFORM_LIBS += $(PLATFORM_LIBGCC) From patchwork Wed Mar 27 14:10:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1916759 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=Zb2k5DPs; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V4Rsf06H5z1yWr for ; Thu, 28 Mar 2024 00:12:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0BD4B880A7; Wed, 27 Mar 2024 14:11:34 +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="Zb2k5DPs"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 76F6C8800C; Wed, 27 Mar 2024 14:11:33 +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.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on20600.outbound.protection.outlook.com [IPv6:2a01:111:f403:2606::600]) (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 DF6F1880E8 for ; Wed, 27 Mar 2024 14:11:29 +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=XRiqWDEy4XIbi5wqqPcl6djB5rxn0wU6foNxyZeoOw717evfMI0iTu88TkPCSEXs+99tnXwXy0wHSHhp0JWjDeAO8eZGrH6I8pfik2sX2iNoIRdlsGvX4A6W/bY+UOhBYl07CG1jXZEjgj6ZdrQot2f7MuQ+5yWpBlAtiWLjXaT0WzG4FIAAdb5d6ToHxfnpyf+2dz/zaj5WyJ2143mZ9veVkUXcpkCEAiMDHVfQQ6s9Lpknst8B3aa8B8pAgg3FCTHoUVPvB7rFQEryXFW125RyOo+Db6UN8tXP0ULqHnyLzXItV0KYXnqs054wYR45wSYsd0GqlMi2nUQWcftTlw== 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=WDBYFeelG2pxJFQyVkxYDijXU4QusAKDKkS2RdcIdls=; b=BT4q+WlFuQX5yw+M1IRq7vtf7JOqqRHDgtacz04uoPiAvTgk62wEAQSvyaQqhQhqbt0RG0f9tUGcaFBZjj1+UWGPJsg86CWHLLWfoRBEw4kWzeaiWgTaP0Gf2pBSVmTQTBAuVVhb9zZPTKBaXwVEXr/aEoFGx4DDKfTDqTYK0SkmlucH1wkpcwrzjdnBj6aSA+bzF9g4zcJ6Db7OCCg8rKnq/UYW6XfWY/H1FcnJPMrpyFiB6H5/vGmqDj6ZHfVuD+NT8o4iZAOKvuI7SnZlrRui/cKl3uUeTnImr1zby0JXKFa5AoRWMrs5IzpPSyQ0ptQxNI84rmi6rd73l1b1Pg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; 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=WDBYFeelG2pxJFQyVkxYDijXU4QusAKDKkS2RdcIdls=; b=Zb2k5DPsXjyy1aZPgWdf1lsALRWg8dSvRX1L6VmTWZuApJ02fJ9gejqA7zwfmTSZ2Cv6QtBAdq2jvOgPiW3/zjgOwakxOjlm1aeg1F/XLB1BxmvIbOnWn8iLWSVQ77PW/iEdA/j16v91WN7ZEulKmowqx72x8Hg7F5pnlcIoL/E= 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 VI1PR04MB7199.eurprd04.prod.outlook.com (2603:10a6:800:11d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.32; Wed, 27 Mar 2024 13:11:26 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::d30b:44e7:e78e:662d]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::d30b:44e7:e78e:662d%4]) with mapi id 15.20.7386.037; Wed, 27 Mar 2024 13:11:26 +0000 From: "Peng Fan (OSS)" Date: Wed, 27 Mar 2024 22:10:50 +0800 Subject: [PATCH 6/6] imx: imx93-11x11-evk: convert to OF_UPSTREAM Message-Id: <20240327-imx93-of-v1-6-afab6b31422a@nxp.com> References: <20240327-imx93-of-v1-0-afab6b31422a@nxp.com> In-Reply-To: <20240327-imx93-of-v1-0-afab6b31422a@nxp.com> To: Stefano Babic , Fabio Estevam , "NXP i.MX U-Boot Team" Cc: Sumit Garg , Tom Rini , u-boot@lists.denx.de, Peng Fan X-Mailer: b4 0.12.3 X-ClientProxiedBy: SI1PR02CA0048.apcprd02.prod.outlook.com (2603:1096:4:1f5::11) 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-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|VI1PR04MB7199:EE_ X-MS-Office365-Filtering-Correlation-Id: ca3f7038-a3f6-4212-0b5c-08dc4e5f68a4 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vxg3qJoshC1nNfWMThErp3zL8T9fcf2JD851Zyw5ADMLBGzMf+Oy+8RNvvxqqnSOnsUmtwS5OdkwzHqMRFyzrZb/YYcSB5f7twbYqmNUS0Z7+o1BZFh723A+BdcM1bhMoINlrQuYcpGyiovTJ+hJc3WkUNXIc4CJzgsMTcwgecuNyZLTfc4QYZME27U9BwjS6jlNQhgvmlsb5EVN8kQ5G551OPdeoIwLuyDg7192UbWMZmIDY6S46ZMWP3HN1yOFXevlxYH/U579x17B3kyDBvC0kl1zqqqnLdGoi7DPSQns2GO40Gh5N5F8pYfukHTo0YDBPmIrFbzzp9g1Lbya6AvOix6xC21yMgzXoqfuL9jaEdAbTYAEPlYa69TouSYldejPSGqPLEPkZsy/IU27SUaC3/14rZOwib+4BzVlqL5iUEUculn57t8PaocSmWL1olbYwaZX/HrFTEapmoMHJW5KC14fiXgT4a4fHhQJzJf5tCnhx0IsLpIkRnw/R/wQvzdtgFya4fJ4j+Eo9NBIaNXummtOM7qfawBVIoi1wDbwSOmH0r93PUR/7hcbhxMMHEog4cfL8HRO+l+iqjXcLBbwFI7AWQO/PzPx9u1VF6y59zglak6nG0WOkpboXhJtnRpaQdeu+RrW+uDa/a5dPQBAahE4IpLWydzto1QpryEnQ6AQ4CZx4W/OgH2rVp/vTnCSIpvIjI1m9leQ6VMUJVKJtKMmKhUnNBJJ0OxhMB8= 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:(13230031)(1800799015)(52116005)(376005)(366007)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?9Z0uxkbKTHXCWMroxI9+HeGUQjda?= =?utf-8?q?Wfc8jrZ8LJCxJCjJ5Lg1KYtENzgInycCthkCjacRBfZyd2EhYBdk5rVr9I1dBFBSZ?= =?utf-8?q?g/Sb8DLjtltr1OTt/gbtr2soM0j3K3NIcP/JKxzHSZB4UpukV+vhYnPitazqyr+GY?= =?utf-8?q?oGxex92uz8fGNL66ZpIpe/tDDkRXEAUng+Nv1YMd3r9QtLEZ+Z8lq41Z2MPQ3S3CY?= =?utf-8?q?eea7jS6qTyB9XI+U+Y+V0KEOhnz3vdoUjEQ9FdwZwLpz6fj0RJG4G47BWLoA719gB?= =?utf-8?q?p6F28WKtqtsIyrAiZ5gg0wNImXWCDnRgvQv/kRXOXwDGALTgGqP5nyJPPiOB1yd2a?= =?utf-8?q?SeHC9GcU1MLyIYbSX4Qq4gkl66XRDEnlk2ntw3kShnymrMKbuAaT2UVh4dl1vj/4C?= =?utf-8?q?OPJZX89JOLbHofY5zaqAc0zmx11ovnzB1SN7biiEt+a9hzqZjIKb8A12nSHK/V7q7?= =?utf-8?q?BtloEoA6od3lv3498dpj7w6Ypu582n7CbP++Gy7d51w3rPtsYDcyIUEUMfIx2KRKO?= =?utf-8?q?9zjtgmDou3jbSdHL/KVa50vY7Yvm/YBIs/JSOPbOwASZ1lUstxCxIA+QqIObBNYqI?= =?utf-8?q?24IPJxBWXUmVxMG0OxO3TkU2hBL5UI/KU9Md50o0hmEJ6m6WO+zBvPraseFE2iNT0?= =?utf-8?q?6/HiCOk/LqiR9dnRwETjcIblBNs8b6kTvn345AUUpzv+hqY3xEl6nlv5+zGy4u2vV?= =?utf-8?q?mTdDUMdRgLg+VfPPu5yh2a54N6/EKp72tnpVkOOUPzDUMUwQnAuCsg7dyAaR7q1hS?= =?utf-8?q?WU82UrQ88RxUNhewT4ov8Ou+rWltWarjaqfkNkFat4af1Say1b3ZZ57HJQMIdjGxe?= =?utf-8?q?2FCrjaiUWMgBL8J+xI38HfadysRXDCppCGCTXOWOy1LKQdmfhGS3n4JZIWqBzx8m1?= =?utf-8?q?z2ZelCHpb6C9Wm4Qz+Uqw9EH+whqVJekzZIsLOyBH8823JyCC/FmezavXbFR2r8Er?= =?utf-8?q?zoQL+HHOhQuxGbV7O0MO8/6nrnKoOA9RK8p4TGhVW61y27EaSKYAs0zXIbCcq6dx7?= =?utf-8?q?RS/IPrPgvuxLJwsF/OiKtTZ7qXpbwzLv9nhll/XOZ/qNuCydT628Fwp65OMXuuKCF?= =?utf-8?q?MHqrp91Na4x/IBsP/xV3w4c2y13u0r/4hb2UiXCpXUP3nYQlPjoHRkvk/jlg5RneD?= =?utf-8?q?X3kr0CxFI/7BWLTl8Yc+mHRhqW+cXj9zjbqIGvCQFo2HrTiZj1RaSb4Uar+ICSf5A?= =?utf-8?q?KOvl5eTNTeIuBA4JvuUVwifx9PLps0MmaEjSNMeu4+OLoSz3NBYX8JtUGHMYIrD+4?= =?utf-8?q?cFtMwQdGvOH3xrpDLiRq7B4TtWW3uuJjPFIKmu5dcTvozu6Aiv3jMfANEdjJ7DgDx?= =?utf-8?q?Xh7Ug4gpW4vxXp3g2CCggThhWfkifYRMbDTckByoMqRILUnGFpGN9KajwntFH07ZT?= =?utf-8?q?xdZE+mFjnTBs5wiiI68+POoQdr4mjWs4eKl6KDrB0zBGfoNkXOM2TkhdPvkTqDLyK?= =?utf-8?q?hUuAwn6ikTEcnaN1uecgb/cSxp0O4WTgXnI3BYFOC+HzZEFRB0XniZBuFfG7UgOfy?= =?utf-8?q?0veyDt1bwDX3?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca3f7038-a3f6-4212-0b5c-08dc4e5f68a4 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2024 13:11:26.5367 (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: fSK4+PFYLmK7sVya44mXc93Wj9U3MAHlvEu/gt5C8r2y2XG4yZ9STn/EjEkaNMBoK6GlNNZ5NL2Q8CoRdOKRyQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7199 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.8 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan Convert to OF_UPSTREAM for i.MX93 11x11 EVK. Signed-off-by: Peng Fan --- arch/arm/dts/Makefile | 1 - arch/arm/dts/imx93-11x11-evk-u-boot.dtsi | 118 +++++++++++ arch/arm/dts/imx93-11x11-evk.dts | 322 ------------------------------- arch/arm/dts/imx93-u-boot.dtsi | 15 ++ arch/arm/mach-imx/imx9/Kconfig | 1 + configs/imx93_11x11_evk_defconfig | 2 +- configs/imx93_11x11_evk_ld_defconfig | 2 +- 7 files changed, 136 insertions(+), 325 deletions(-) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index d85a33055c9..71c2facfb5e 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -1115,7 +1115,6 @@ dtb-$(CONFIG_ARCH_IMX8M) += \ imx8mq-librem5-r4.dtb dtb-$(CONFIG_ARCH_IMX9) += \ - imx93-11x11-evk.dtb \ imx93-var-som-symphony.dtb \ imx93-phyboard-segin.dtb diff --git a/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi b/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi index a99ba99bfb4..408e601bc90 100644 --- a/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi +++ b/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi @@ -26,6 +26,111 @@ bootph-pre-ram; }; +&lpi2c2 { + #address-cells = <1>; + #size-cells = <0>; + clock-frequency = <400000>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pinctrl_lpi2c2>; + pinctrl-1 = <&pinctrl_lpi2c2>; + status = "okay"; + + pmic@25 { + compatible = "nxp,pca9451a"; + reg = <0x25>; + interrupt-parent = <&pcal6524>; + interrupts = <11 IRQ_TYPE_LEVEL_LOW>; + + regulators { + buck1: BUCK1 { + regulator-name = "BUCK1"; + regulator-min-microvolt = <650000>; + regulator-max-microvolt = <2237500>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <3125>; + }; + + buck2: BUCK2 { + regulator-name = "BUCK2"; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <2187500>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <3125>; + }; + + buck4: BUCK4{ + regulator-name = "BUCK4"; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <3400000>; + regulator-boot-on; + regulator-always-on; + }; + + buck5: BUCK5{ + regulator-name = "BUCK5"; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <3400000>; + regulator-boot-on; + regulator-always-on; + }; + + buck6: BUCK6 { + regulator-name = "BUCK6"; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <3400000>; + regulator-boot-on; + regulator-always-on; + }; + + ldo1: LDO1 { + regulator-name = "LDO1"; + regulator-min-microvolt = <1600000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + + ldo4: LDO4 { + regulator-name = "LDO4"; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + + ldo5: LDO5 { + regulator-name = "LDO5"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + }; + }; + + pcal6524: gpio@22 { + compatible = "nxp,pcal6524"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcal6524>; + reg = <0x22>; + gpio-controller; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; + interrupt-parent = <&gpio3>; + interrupts = <27 IRQ_TYPE_LEVEL_LOW>; + }; + + adp5585gpio: gpio@34 { + compatible = "adp5585"; + reg = <0x34>; + gpio-controller; + #gpio-cells = <2>; + }; +}; + &aips1 { bootph-pre-ram; bootph-all; @@ -44,6 +149,19 @@ &iomuxc { bootph-pre-ram; bootph-some-ram; + + pinctrl_lpi2c2: lpi2c2grp { + fsl,pins = < + MX93_PAD_I2C2_SCL__LPI2C2_SCL 0x40000b9e + MX93_PAD_I2C2_SDA__LPI2C2_SDA 0x40000b9e + >; + }; + + pinctrl_pcal6524: pcal6524grp { + fsl,pins = < + MX93_PAD_CCM_CLKO2__GPIO3_IO27 0x31e + >; + }; }; ®_usdhc2_vmmc { diff --git a/arch/arm/dts/imx93-11x11-evk.dts b/arch/arm/dts/imx93-11x11-evk.dts deleted file mode 100644 index 4322cc3e11b..00000000000 --- a/arch/arm/dts/imx93-11x11-evk.dts +++ /dev/null @@ -1,322 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2022 NXP - */ - -/dts-v1/; - -#include "imx93.dtsi" - -/ { - model = "NXP i.MX93 11X11 EVK board"; - compatible = "fsl,imx93-11x11-evk", "fsl,imx93"; - - chosen { - stdout-path = &lpuart1; - }; - - reg_vref_1v8: regulator-adc-vref { - compatible = "regulator-fixed"; - regulator-name = "vref_1v8"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - reg_usdhc2_vmmc: regulator-usdhc2 { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_reg_usdhc2_vmmc>; - regulator-name = "VSD_3V3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - gpio = <&gpio3 7 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; -}; - -&adc1 { - vref-supply = <®_vref_1v8>; - status = "okay"; -}; - -&mu1 { - status = "okay"; -}; - -&mu2 { - status = "okay"; -}; - -&eqos { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_eqos>; - phy-mode = "rgmii-id"; - phy-handle = <ðphy1>; - status = "okay"; - - mdio { - compatible = "snps,dwmac-mdio"; - #address-cells = <1>; - #size-cells = <0>; - clock-frequency = <5000000>; - - ethphy1: ethernet-phy@1 { - reg = <1>; - eee-broken-1000t; - }; - }; -}; - -&fec { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_fec>; - phy-mode = "rgmii-id"; - phy-handle = <ðphy2>; - fsl,magic-packet; - status = "okay"; - - mdio { - #address-cells = <1>; - #size-cells = <0>; - clock-frequency = <5000000>; - - ethphy2: ethernet-phy@2 { - reg = <2>; - eee-broken-1000t; - }; - }; -}; - -&lpi2c2 { - #address-cells = <1>; - #size-cells = <0>; - clock-frequency = <400000>; - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&pinctrl_lpi2c2>; - pinctrl-1 = <&pinctrl_lpi2c2>; - status = "okay"; - - pmic@25 { - compatible = "nxp,pca9451a"; - reg = <0x25>; - interrupt-parent = <&pcal6524>; - interrupts = <11 IRQ_TYPE_LEVEL_LOW>; - - regulators { - buck1: BUCK1 { - regulator-name = "BUCK1"; - regulator-min-microvolt = <650000>; - regulator-max-microvolt = <2237500>; - regulator-boot-on; - regulator-always-on; - regulator-ramp-delay = <3125>; - }; - - buck2: BUCK2 { - regulator-name = "BUCK2"; - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <2187500>; - regulator-boot-on; - regulator-always-on; - regulator-ramp-delay = <3125>; - }; - - buck4: BUCK4{ - regulator-name = "BUCK4"; - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <3400000>; - regulator-boot-on; - regulator-always-on; - }; - - buck5: BUCK5{ - regulator-name = "BUCK5"; - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <3400000>; - regulator-boot-on; - regulator-always-on; - }; - - buck6: BUCK6 { - regulator-name = "BUCK6"; - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <3400000>; - regulator-boot-on; - regulator-always-on; - }; - - ldo1: LDO1 { - regulator-name = "LDO1"; - regulator-min-microvolt = <1600000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - regulator-always-on; - }; - - ldo4: LDO4 { - regulator-name = "LDO4"; - regulator-min-microvolt = <800000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - regulator-always-on; - }; - - ldo5: LDO5 { - regulator-name = "LDO5"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - regulator-always-on; - }; - }; - }; - - pcal6524: gpio@22 { - compatible = "nxp,pcal6524"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pcal6524>; - reg = <0x22>; - gpio-controller; - #gpio-cells = <2>; - interrupt-controller; - #interrupt-cells = <2>; - interrupt-parent = <&gpio3>; - interrupts = <27 IRQ_TYPE_LEVEL_LOW>; - }; - - adp5585gpio: gpio@34 { - compatible = "adp5585"; - reg = <0x34>; - gpio-controller; - #gpio-cells = <2>; - }; -}; - -&lpuart1 { /* console */ - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart1>; - status = "okay"; -}; - -&usdhc1 { - pinctrl-names = "default", "state_100mhz", "state_200mhz"; - pinctrl-0 = <&pinctrl_usdhc1>; - pinctrl-1 = <&pinctrl_usdhc1>; - pinctrl-2 = <&pinctrl_usdhc1>; - bus-width = <8>; - non-removable; - status = "okay"; -}; - -&usdhc2 { - pinctrl-names = "default", "state_100mhz", "state_200mhz"; - pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>; - pinctrl-1 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>; - pinctrl-2 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>; - cd-gpios = <&gpio3 00 GPIO_ACTIVE_LOW>; - vmmc-supply = <®_usdhc2_vmmc>; - bus-width = <4>; - status = "okay"; - no-sdio; - no-mmc; -}; - -&iomuxc { - pinctrl_lpi2c2: lpi2c2grp { - fsl,pins = < - MX93_PAD_I2C2_SCL__LPI2C2_SCL 0x40000b9e - MX93_PAD_I2C2_SDA__LPI2C2_SDA 0x40000b9e - >; - }; - - pinctrl_pcal6524: pcal6524grp { - fsl,pins = < - MX93_PAD_CCM_CLKO2__GPIO3_IO27 0x31e - >; - }; - - pinctrl_eqos: eqosgrp { - fsl,pins = < - MX93_PAD_ENET1_MDC__ENET_QOS_MDC 0x57e - MX93_PAD_ENET1_MDIO__ENET_QOS_MDIO 0x57e - MX93_PAD_ENET1_RD0__ENET_QOS_RGMII_RD0 0x57e - MX93_PAD_ENET1_RD1__ENET_QOS_RGMII_RD1 0x57e - MX93_PAD_ENET1_RD2__ENET_QOS_RGMII_RD2 0x57e - MX93_PAD_ENET1_RD3__ENET_QOS_RGMII_RD3 0x57e - MX93_PAD_ENET1_RXC__CCM_ENET_QOS_CLOCK_GENERATE_RX_CLK 0x5fe - MX93_PAD_ENET1_RX_CTL__ENET_QOS_RGMII_RX_CTL 0x57e - MX93_PAD_ENET1_TD0__ENET_QOS_RGMII_TD0 0x57e - MX93_PAD_ENET1_TD1__ENET_QOS_RGMII_TD1 0x57e - MX93_PAD_ENET1_TD2__ENET_QOS_RGMII_TD2 0x57e - MX93_PAD_ENET1_TD3__ENET_QOS_RGMII_TD3 0x57e - MX93_PAD_ENET1_TXC__CCM_ENET_QOS_CLOCK_GENERATE_TX_CLK 0x5fe - MX93_PAD_ENET1_TX_CTL__ENET_QOS_RGMII_TX_CTL 0x57e - >; - }; - - pinctrl_fec: fecgrp { - fsl,pins = < - MX93_PAD_ENET2_MDC__ENET1_MDC 0x57e - MX93_PAD_ENET2_MDIO__ENET1_MDIO 0x57e - MX93_PAD_ENET2_RD0__ENET1_RGMII_RD0 0x57e - MX93_PAD_ENET2_RD1__ENET1_RGMII_RD1 0x57e - MX93_PAD_ENET2_RD2__ENET1_RGMII_RD2 0x57e - MX93_PAD_ENET2_RD3__ENET1_RGMII_RD3 0x57e - MX93_PAD_ENET2_RXC__ENET1_RGMII_RXC 0x5fe - MX93_PAD_ENET2_RX_CTL__ENET1_RGMII_RX_CTL 0x57e - MX93_PAD_ENET2_TD0__ENET1_RGMII_TD0 0x57e - MX93_PAD_ENET2_TD1__ENET1_RGMII_TD1 0x57e - MX93_PAD_ENET2_TD2__ENET1_RGMII_TD2 0x57e - MX93_PAD_ENET2_TD3__ENET1_RGMII_TD3 0x57e - MX93_PAD_ENET2_TXC__ENET1_RGMII_TXC 0x5fe - MX93_PAD_ENET2_TX_CTL__ENET1_RGMII_TX_CTL 0x57e - >; - }; - - pinctrl_uart1: uart1grp { - fsl,pins = < - MX93_PAD_UART1_RXD__LPUART1_RX 0x31e - MX93_PAD_UART1_TXD__LPUART1_TX 0x31e - >; - }; - - pinctrl_usdhc1: usdhc1grp { - fsl,pins = < - MX93_PAD_SD1_CLK__USDHC1_CLK 0x15fe - MX93_PAD_SD1_CMD__USDHC1_CMD 0x13fe - MX93_PAD_SD1_DATA0__USDHC1_DATA0 0x13fe - MX93_PAD_SD1_DATA1__USDHC1_DATA1 0x13fe - MX93_PAD_SD1_DATA2__USDHC1_DATA2 0x13fe - MX93_PAD_SD1_DATA3__USDHC1_DATA3 0x13fe - MX93_PAD_SD1_DATA4__USDHC1_DATA4 0x13fe - MX93_PAD_SD1_DATA5__USDHC1_DATA5 0x13fe - MX93_PAD_SD1_DATA6__USDHC1_DATA6 0x13fe - MX93_PAD_SD1_DATA7__USDHC1_DATA7 0x13fe - MX93_PAD_SD1_STROBE__USDHC1_STROBE 0x15fe - >; - }; - - pinctrl_reg_usdhc2_vmmc: regusdhc2vmmcgrp { - fsl,pins = < - MX93_PAD_SD2_RESET_B__GPIO3_IO07 0x31e - >; - }; - - pinctrl_usdhc2_gpio: usdhc2gpiogrp { - fsl,pins = < - MX93_PAD_SD2_CD_B__GPIO3_IO00 0x31e - >; - }; - - pinctrl_usdhc2: usdhc2grp { - fsl,pins = < - MX93_PAD_SD2_CLK__USDHC2_CLK 0x15fe - MX93_PAD_SD2_CMD__USDHC2_CMD 0x13fe - MX93_PAD_SD2_DATA0__USDHC2_DATA0 0x13fe - MX93_PAD_SD2_DATA1__USDHC2_DATA1 0x13fe - MX93_PAD_SD2_DATA2__USDHC2_DATA2 0x13fe - MX93_PAD_SD2_DATA3__USDHC2_DATA3 0x13fe - MX93_PAD_SD2_VSELECT__USDHC2_VSELECT 0x51e - >; - }; -}; diff --git a/arch/arm/dts/imx93-u-boot.dtsi b/arch/arm/dts/imx93-u-boot.dtsi index 40e17bbc5ae..289aba17584 100644 --- a/arch/arm/dts/imx93-u-boot.dtsi +++ b/arch/arm/dts/imx93-u-boot.dtsi @@ -86,3 +86,18 @@ }; }; }; + +&tmu { + compatible = "fsl,imx93-tmu"; + reg = <0x44482000 0x1000>; + clocks = <&clk IMX93_CLK_TMC_GATE>; + little-endian; + fsl,tmu-calibration = <0x0000000e 0x800000da + 0x00000029 0x800000e9 + 0x00000056 0x80000102 + 0x000000a2 0x8000012a + 0x00000116 0x80000166 + 0x00000195 0x800001a7 + 0x000001b2 0x800001b6>; + #thermal-sensor-cells = <1>; +}; diff --git a/arch/arm/mach-imx/imx9/Kconfig b/arch/arm/mach-imx/imx9/Kconfig index b79485f1f75..e892da80fe8 100644 --- a/arch/arm/mach-imx/imx9/Kconfig +++ b/arch/arm/mach-imx/imx9/Kconfig @@ -31,6 +31,7 @@ choice config TARGET_IMX93_11X11_EVK bool "imx93_11x11_evk" select IMX93 + imply OF_UPSTREAM config TARGET_IMX93_VAR_SOM bool "imx93_var_som" diff --git a/configs/imx93_11x11_evk_defconfig b/configs/imx93_11x11_evk_defconfig index 63613477c7f..a671de7ca40 100644 --- a/configs/imx93_11x11_evk_defconfig +++ b/configs/imx93_11x11_evk_defconfig @@ -10,7 +10,7 @@ CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x700000 CONFIG_IMX_CONFIG="arch/arm/mach-imx/imx9/imximage.cfg" CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="imx93-11x11-evk" +CONFIG_DEFAULT_DEVICE_TREE="freescale/imx93-11x11-evk" CONFIG_SPL_TEXT_BASE=0x2049A000 CONFIG_TARGET_IMX93_11X11_EVK=y CONFIG_SYS_MONITOR_LEN=524288 diff --git a/configs/imx93_11x11_evk_ld_defconfig b/configs/imx93_11x11_evk_ld_defconfig index 4e3bbdd0cf5..4e1f162e35a 100644 --- a/configs/imx93_11x11_evk_ld_defconfig +++ b/configs/imx93_11x11_evk_ld_defconfig @@ -10,7 +10,7 @@ CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x400000 CONFIG_IMX_CONFIG="arch/arm/mach-imx/imx9/imximage.cfg" CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="imx93-11x11-evk" +CONFIG_DEFAULT_DEVICE_TREE="freescale/imx93-11x11-evk" CONFIG_SPL_TEXT_BASE=0x2049A000 CONFIG_IMX9_LOW_DRIVE_MODE=y CONFIG_TARGET_IMX93_11X11_EVK=y