From patchwork Thu Mar 28 00:52:58 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: 1917071 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=WyoXuUFn; 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 4V4k5b2CyZz1yWr for ; Thu, 28 Mar 2024 10:53:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6474B88125; Thu, 28 Mar 2024 00:53: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=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="WyoXuUFn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 67CB188124; Thu, 28 Mar 2024 00:53:28 +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-db8eur05on20611.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::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 906D987D2E for ; Thu, 28 Mar 2024 00:53:26 +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=TrMM55avL3CmsUfs1k1gsPLuEL3InQESgrnk2edlA5EeCiDKa6UsOK4lk+VtJcMbVH1Yva8ZGqToWczOoH7rbrV7r3pDkw4CIx1UCb6IhzZTfHYGawm2YGhYDWjv9XnYRHEiMIQyQJZYRpw/WhoBheT2KjHWzYTXpSUO85Zarh5pi4M785RFDS5SCg5wGtdyNUhjDMVVKgVLzFTBs91lbyrAczFSLfed31YsFo0dLrS+3AkK1LR1YWpFqs+p0YkkDcn6Aoii+O8XeA1V2ha4VEFNWHQdEG4utpFKaYPScA/JgkGIOz2Vo5/fy8lK7EbiaqWNQenB9OjJk0zrwGvBng== 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=RDCMfofJZ5fiXAd22ccCHFsrRVQ8+3Si1SLWyxe3rbMSXuSaQfmMpxgTM1ygUc0/kektosEbm1Cc2xkvRIEAfHi234K4ZjrgEG9dJB41QxUSjgeP67EWP6Avvtw/tRVxtwkI1Ow15sRVvJXORmmYgbckA+iP2PeBRRZwzy9raU3fUnIgYX78lS43izT32jyQJWpLZ+wHRnNHuQer4Enhz5qVO/9I0k2pFTUkViJmBL655hmhwbW3Mcm5YBfXFE6WOchAzPo5JHEpBVO9+wd1Z8b05I5BSHCJxRD+8SAQH+36v/nLRpRZvr5SC3FLuBByL0gQSRKgJfZR004BHh+p2g== 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=WyoXuUFnjgtymqvwk6Af9r1d9kikcszQbiQgF9SF95ZQUGE77P/92RCArwIF97b9eCuV/A+hojGJ+ePSX3l8cmgtbCBSS/eNQNo/FToJDYO6AMlavmrFFcfQJQtf8hHIKPs9QMx8UgMBoFoN2BDRjgaFY+HBAU2Ct0kOLIabXyI= 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 DUZPR04MB10064.eurprd04.prod.outlook.com (2603:10a6:10:4d3::15) 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 23:53:25 +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 23:53:25 +0000 From: "Peng Fan (OSS)" Date: Thu, 28 Mar 2024 08:52:58 +0800 Subject: [PATCH v3 1/6] gpio: imx_rgpio2p: support one address Message-Id: <20240328-imx93-of-v3-1-4e7f341ed7ea@nxp.com> References: <20240328-imx93-of-v3-0-4e7f341ed7ea@nxp.com> In-Reply-To: <20240328-imx93-of-v3-0-4e7f341ed7ea@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: SG3P274CA0021.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::33) 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_|DUZPR04MB10064:EE_ X-MS-Office365-Filtering-Correlation-Id: 6dd5a139-2868-4cdc-4e9a-08dc4eb91796 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: mxfGI3TlfHArD5oodB/jJ1//LDzFDMadk4BPGaoXeZ1IKzqPYmwFLPVpzAPNpmxGwpkfxShwtrly38scCLMUS0tQCqLvIZvFtyVy+7kgMhMGaRnHZgWYoR9WaA2pmpc6Sm1YG7htPaniwbj9CsfNmiD3fQaHSGdXqgPOt33/jpwPqhtQUvyqIuFoBLN6QVNKfs9Yu11ULRUz8lwadBXCZLZdZ51czDeVK/Egf3+s70Bf+S/ZkX74cYjJCZnzVBedaJyZ0pLVSPFIcBgu9vrsXAmN6C/xOaOQn4lsi3Ud/RixUyLvNXugW6jIiLGgAtciMEEzkOQ9vrIf/+FI8RZOr7Cgh0YRjXjC4TKgs/m737i7sNiCX8tcznTSg8r8nYcXPkdyPaVsnKMWPHdST9sZW8bpzzbzfnWYKrhAKKmw12454RqAWZrufzpRBos1DECjbmpsjfftLDVmWhNJhbouB6lNaSx9Lp247RMb8yHZSyJnSOPLJ5pzlUtgireZ0jYZM05I4wnilQr3u8IWyjbf9MDI86HYjeOYGo8AXYKAo+87FCgI/Uiqo/DvJwSTVfh0gSNJna2jSGSVicH82kfIrZSRSo3vpKmGL82OXJliGeaOLpdcJ+3c2a/Xi8E1J/uwl+OWsrE1JKgQVneES0cCSjIFEpqvYLJG99hSyla+skYqYYDas9QkJi8Yu7ij4i5IJ1ay9ymhjKRbdLtLBlIR3SVS8zraRbW9jkfvJ72/Xt8= 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)(366007)(376005)(52116005)(1800799015)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?IJIF05K8qweSp/UzN73Yl7hDBSFF?= =?utf-8?q?hdm/W8+E+MOuTu6slDezghDApaZfIVt07Ia1ewtT4qSVhuJhrZYzV/3MvCui8/uFL?= =?utf-8?q?ogqHlYMZYU0JE0/9lEFsCp6NCuKbMZY0GZznNDoB93EFm9esirE8jcP/9N5oVWM5Z?= =?utf-8?q?Hb201/VpaZshTU5K1GPoq7gIq+b6+RXxBAk6LvZ0g2KNgS6FSEmgFh63tCN/Myu/2?= =?utf-8?q?yormpZhK4nnbIVIcvOh53B7M2l5j22Ox5yinHqon5Bq8867hd9+J9z1tZ/MxD95ZK?= =?utf-8?q?z9Eckg1CZ+pVXgJDfLG0wW+oikk02dMdORecklmX/Y7Bq83VH0/LgaNIu+xr0rh/Z?= =?utf-8?q?+oo7ZWgDkynfoY8qH0oqGSYUlYpWOqxweB6Ztkkg+QU1niUT9SjwBCkB7+lJJO/cX?= =?utf-8?q?ur5Hsv5hWiQI+iWVPaoCuCHrnW8UKxLHraSbC2NDO1EyX7OT4wrX1t2LN0AzGPrr3?= =?utf-8?q?mqe0vyyj6ztsSqLHCjIqLvOBP/Ius3u4nKEfrgBV2CAsdn/QYbvNIl39QTY4KY4yZ?= =?utf-8?q?NVud1dnvemgy0wmIaYRbTXhZ1hkQsw9Jx7Uy9oAx4anUeX3qEq5V6NQMSSAh4ElbI?= =?utf-8?q?D/llpO0IoAAEjyClswGPYVuIw7T3dLO7k5agJtXPAAuABAkhMtrtnLiiTABd2GRcy?= =?utf-8?q?WILrGNK2CTYpz3PB45TnszOCUkFA7fOHTi1CSEtjuV//kmdZhl5oGwhgy9PhDhoGB?= =?utf-8?q?JhajoQOKUHokRdhuLQycBZ/imRIs644kC2VnL5ki0UHKf1f5HOq2Cgahhip6pvzYg?= =?utf-8?q?+Avfh/hSijzGudMe/JEqZhfa552dDF/iR+GEV4MSISkybla1pWOfuaeIWofIf1rh+?= =?utf-8?q?Ra20dty7Ym/+1i4BSRTRYYU8GODnyyMfZa5T7B3by7aBbbpspgPBHBCgJ9ozu9SQ8?= =?utf-8?q?kjnAR3N3YAiqeKBglVgX6QUnQ9SMqS5ojGsF1ouLLZlaHURDAQhOj4sEA+0WfrnJq?= =?utf-8?q?jfZk61aj/47hMUee6ORa5FkZQfUpIhqdF69W9GMiUU6Jnhh7MOHfl9OA+st6RyZTp?= =?utf-8?q?J++5Ca2M+SrRaX7g4b9bJhL4a5KoeH7mZOpnc8q8vb9QJjpV3z/zs+6QEPZr1fPzM?= =?utf-8?q?Qf8fo+7JBiP/kXn/dZOr7q5yuM4eAqaKNWe3BYPOB6JNThv/M0Oj0tmW8BCtXPOTR?= =?utf-8?q?Ts47LAOrWhRbEyfbkh+t8TDuc5AZgSlXTAGD94pffjJry7VyRDxdy+V2FeJx0M08S?= =?utf-8?q?tbpOcuWD5vHwMeUzNvt/IegshQuN8kZUi9LmISiJasaBJlJJL/qo/Lz+7hVN9MtYR?= =?utf-8?q?LxHc7QVy6cMKOr1n8jWopDtZMzouyuG17oIMrQX/O32nzotqMHM5hfv7h0P8BavVE?= =?utf-8?q?o7ZqUfTm1qaex+JrW6GLJL8wsNzETL3PeW8YQ+FR5D9lv02SbNc5Ib2sNM3sOm3ZD?= =?utf-8?q?bmHc1pENYVcQVY+UxlJntRQV2F6Cl+/cMMP2vG9eBrr1g+Jw7E7heJa3zX9ii1CgI?= =?utf-8?q?dDT1P/W2rnAQ7woCJSag+rU33YlvfJigC9+7k0r2MwfVnR9bfnUfJ2Nd2kalG5gMb?= =?utf-8?q?TSuDqjdcl4AN?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6dd5a139-2868-4cdc-4e9a-08dc4eb91796 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2024 23:53:25.3339 (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: FR64xP0vLKoMmYtb6FEK9CZ1JxFdnr6Cu6JyWAcNZiVP1YfAdVH7KPA1WVguXnJdgs4KoK0dYFDJ0vw9ZTENYA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DUZPR04MB10064 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 }, { } };