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 }, { } };