Message ID | 20230926-vf610-gpio-v4-4-b57b7f6e8368@nxp.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp1817879vqu; Tue, 26 Sep 2023 03:49:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5zQCk/T4wOnkn6TL86V/MsOEzEqv+Di2KBfDjYupW0rn3wQda0FWbtLUXTqKxdUwxeCMR X-Received: by 2002:a05:6a20:748c:b0:15e:bf2b:e6c8 with SMTP id p12-20020a056a20748c00b0015ebf2be6c8mr5565436pzd.2.1695725342975; Tue, 26 Sep 2023 03:49:02 -0700 (PDT) Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id z14-20020a17090ad78e00b002772f04f9bfsi7572117pju.113.2023.09.26.03.49.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 03:49:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@NXP1.onmicrosoft.com header.s=selector2-NXP1-onmicrosoft-com header.b="lc1YJZc/"; arc=fail (DNS record missing); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 0CC88818FBD0; Mon, 25 Sep 2023 20:29:29 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231676AbjIZD3W (ORCPT <rfc822;pwkd43@gmail.com> + 27 others); Mon, 25 Sep 2023 23:29:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232956AbjIZD3O (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 25 Sep 2023 23:29:14 -0400 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2087.outbound.protection.outlook.com [40.107.6.87]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD741C9; Mon, 25 Sep 2023 20:29:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ddlsC5epuC1lyDGe6kAWgy8f5yxxwnFyH296JFS4Xm74kaqR0q2ewYHncv31TRcpKvwZLrH/7PiRUmxZeCHJJo7XhvzvA16h5G3yfVn1swCgIn+gIZZtkZBJCX14bvnzyve0GeGqJxvKUDq6TZv9HIwtwiji66+gvN540/yHoh6nWPShUM+oT6Iw4qEGLlQsBKrUgLSjkCnxOHZ8cBVhynL1xvIbTs31QVL+7ywPBRtmxZ7QJ2hCJbGBj/qNAqEToc7pggyjOmQs3bl6pq8q9zA3efw/M2NuBurAxDjwFcQQaYr2/DysN++HzeVJxIDzvhqTGDjykw+ZhGWH7pgkIg== 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=yF9Z9hfm1NOCcRVSQ9L+4/sD9M0C/GPIdy8+5yf3jfM=; b=Z8GF52P3HhK9BLrutYoDXFjSM99ymhJLmF8ZmVKedzIWhzslIm7vJxTGyEyBfnM5J213p0MhpKkImPBFPy/bduSUPBvSp60Idm6Gs0C654lpwWO4UeFtdpC4BDZnUuSLEBOsHModcCtmeXragb/OMNfTxsJz2w97MtfvZYitEbqU7jcQzmxjkIakMRS5lvomhaVOnAZ9MUviJlFuRTRKSNj4tpZyXIzBrU6oFHru1hW6YPfz2fZT30fY4SeHjyDyHpBC3uHfKcULCkaqwYRlE6jI/U2ppay8WGDaTL4RVKMekcPfh4irVVpsVeTCMWdD5FgKxH/icLrrgkcAp75nYw== 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=yF9Z9hfm1NOCcRVSQ9L+4/sD9M0C/GPIdy8+5yf3jfM=; b=lc1YJZc/w//MF7xC6euVCWeUxz8g+6hXMt6Ygl1odR+xn82r1UJH282LUGmO/oGldC1iGrHgz0eyqC1tmxUeFm47TQtoaJB3eLrBFBleI9BTqVtdpd6J3GjHpZzmD+fcVOb/737U1gZceci/HLAykW+mWCojwawkQ7ufCdu64Mg= 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 AS8PR04MB8436.eurprd04.prod.outlook.com (2603:10a6:20b:347::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 03:29:05 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::2b3:d8de:95c8:b28b]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::2b3:d8de:95c8:b28b%3]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 03:29:05 +0000 From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com> Date: Tue, 26 Sep 2023 11:33:20 +0800 Subject: [PATCH v4 4/7] gpio: vf610: add i.MX8ULP of_device_id entry Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230926-vf610-gpio-v4-4-b57b7f6e8368@nxp.com> References: <20230926-vf610-gpio-v4-0-b57b7f6e8368@nxp.com> In-Reply-To: <20230926-vf610-gpio-v4-0-b57b7f6e8368@nxp.com> To: Linus Walleij <linus.walleij@linaro.org>, Bartosz Golaszewski <brgl@bgdev.pl>, Andy Shevchenko <andy@kernel.org>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Conor Dooley <conor+dt@kernel.org>, Stefan Agner <stefan@agner.ch>, Shawn Guo <shawnguo@kernel.org>, Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix Kernel Team <kernel@pengutronix.de>, Fabio Estevam <festevam@gmail.com>, NXP Linux Team <linux-imx@nxp.com>, Marco Felsch <m.felsch@pengutronix.de> Cc: linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Peng Fan <peng.fan@nxp.com> X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1695699209; l=3299; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=JDd/Dfh0RICGNA6i4o6IJd1MoixG0t2bjL+zQLo9U4s=; b=nrW/tDIP9VbgW1pBB9/EU4ERbUoTBcnJsHotxlbehtLsZNixjI8Jl7jSiuF5ILDsQAEodBL9+ edhEzraSX/4BDz4At6G6n8swoBGgaZxI3pghlUHe8tWh2O9Cy3saw9T X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SG2PR02CA0054.apcprd02.prod.outlook.com (2603:1096:4:54::18) 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_|AS8PR04MB8436:EE_ X-MS-Office365-Filtering-Correlation-Id: 6b2e9388-bb6a-4564-e6ec-08dbbe40bc6d 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: Vw67pzaXgPgDe8GxM+1/jZd1R7t0QfGa7BNFXSyWVGOx3Lh7Ve7cvSesAxL2iZxY9hkI+yfkm6i+Y0V5e+Lt3NnYzs8qO2fVnOJnlH3iLNq8F4+miPDQVfm5PsDdXzaKuuBWeIWIXcKEJuh6fWSGES+FN9BEtP7DQMigzpOoxY0OdAUPVrfcqpDChDvRBSdpnGnXzdc5/MiiSarapMvG0jHcXxLMJgmcREJCATDX2cVc/IQ4d2J/EU1l5/eZs0nNIg1o9ndaQeOa21pS/GqeJPJi+TDEoqUPk/kMQwXkUoPa7Wz9aP8G5bzmb9lV92M5Bd8VPKohg1l+g6Jkt3ohu1YJNPFBCqQoJZQ0vscpceQyOOI2OphoDUZfAdv9N0wIJ+O9Sh93XNX/zHdadviePUHZeOWCm8369WuvTpV0PZZydcZWPUdHC+cLEid8TSxcqzgG1Qywk0b4Yf4G3miRdsfbhY0szst2o3LWTnCzrjrU4XeQtP2MegxUo9GUoL+mbxTRdrin/ejs0ZOLU7CImhRUercgw8wNRvtOClx9ij8c4xjAotbHu2bsVszOY85cue9NP2GsCz8UZRG6euliOO4u8qleC9YrybfEDlNQHSwAlZXZ1dCdLWzmXRfoqRIHctIULAyPbU8QSvPoWeytRQ== 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)(396003)(136003)(39860400002)(376002)(366004)(346002)(230922051799003)(1800799009)(451199024)(186009)(41300700001)(8936002)(4326008)(8676002)(7416002)(66476007)(66946007)(66556008)(316002)(26005)(110136005)(86362001)(2906002)(921005)(6486002)(478600001)(38350700002)(83380400001)(36756003)(52116002)(38100700002)(6666004)(6512007)(9686003)(5660300002)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?sAy2s+efUXNMCwZJS7dud/BbKYt+?= =?utf-8?q?UMvAoB2TB039Tpp7yonqYq3gCjZA96uUIpzDvPb2jqFVhug9j/FcJJiqtLh7VmKEp?= =?utf-8?q?vV0j2831+hXD71kRWbMSSxn+MMKQt+G3/u/hG6nZW7ASkkUPAIfaXPNq3DluevCs1?= =?utf-8?q?6yZamBftgUFhc0VK9FWLn22vhGHTt0+fju/ii07/KJu9tG2nvtB9uDUHv4GtSxTZ1?= =?utf-8?q?3DfotG2b4GQCpO9oZID4XUgo6BlUlIMX+P6PMT8VXFilj9HssnCPF7gzdOB8JGaBt?= =?utf-8?q?Hf0YSw93ICTsflfgX7b7aDfoZhBcqQNwcZ/n31niz9UbYpSN0GmRPq+7leT1TzuEw?= =?utf-8?q?29QaT6JyCY5oN2LBhy2spoWESd29XPHwtuBf6eoFgeC2FvN4zDVJ7PC/drx3+pd+q?= =?utf-8?q?e10VwnCcoTRLOfOMG6chVQgRwnshxlAuzTG2MzxvaeYPx0h5qLywrZEUMdTmNVYYs?= =?utf-8?q?1FKonAA+7yud1i/noMRxzGDDmEaqhRWex3MKdC/G4AlTnyw5h0PaxSY0PMEbUx45G?= =?utf-8?q?ijYsGA8dBFg1oXAmlKFKnsLh0S9oTW8puPpaq16TH+lbyInQiX0xiYtvFchOwWqr/?= =?utf-8?q?lReE73VM3e/fMueXWCJOV1omQbQsQBCtMcI5sIIOmptJvWPLZzArh+5EmqCDFWnDG?= =?utf-8?q?b1qstZzs5GqQwrzDLm/aOOey4a8EdsmR8A4Y1kwJKlOP3UhUurjnHFoF/QRSXQ7IL?= =?utf-8?q?18hv+LZhxth/NSYCAELIL2PuU23rdAAMN6T9j77+6hyNLkeElRm06jV69jSTR+Enl?= =?utf-8?q?Y9/+zTxGw5fd+omDpUwC8ejW5Yw6/yjVXeVmxH/KlDYIx9tvQRX/PDLiYoTtgOJF6?= =?utf-8?q?QKqXJequUNW1GhpdQedfnbseaAyIf7ScmiOW6L6Sjzfuqli0kHK8YbiZIyi0q2m5m?= =?utf-8?q?kn7fR2hAf0qIPcsn7VO1dNAu1GTtDEPtaOBOo9LfaIMewyHZtBQONaTHVJgN7ll04?= =?utf-8?q?eUw9oBnyKlDKbKRr8faP7WsGfsVvYrtkV1v+X/9cQxbb+cdgeOWPcPsaSaoOX7+2Y?= =?utf-8?q?LVEsDHGzdDDkXjTX/87YhpOy6npZm+nVVja2fknLJzfBc15Stoi9WnzPwtnk3/Ktt?= =?utf-8?q?TPomKwOSUzDOqg6Wo3bjpjP+HhPWkFq3g4NJ+TPeztYMSqgfJi3wFLRgvFG4KhB2i?= =?utf-8?q?NGqEoYDeEINkaDOi1ymqwGFIl2ZLHXdosvOpzh8s7vOgp+UNzfUfeevTSGvgnvemW?= =?utf-8?q?PQ9wjKBOdAHtPPEWPel36Sa9uJ9S3HzJuQilkIA4cerHqJT0mpfj4FN/ffkqE+qxu?= =?utf-8?q?7NrdCZshQOUQ7r5To/OPD+gz1V2xElU+OSRYzf8ESma+cK5ZDM/mVqvYhLkltA5Qg?= =?utf-8?q?gfF1a/yBGye921Cs5T7RwU6k2PcnwjOEuOrw5oixc97WTI/GRFoUyUycrimkwDjFC?= =?utf-8?q?YkgmrJuLgalRZSor07FnwA5Hr5+b4DdO4QprM/XGMlBVOh4fmUxJNt5fDJdNAWfyU?= =?utf-8?q?qXJiJdFV2Cg0wTn3qflf4SFMSGu76U+tcSjFqoxixPlz5Y3FaKQXsj87eD6ZQVOXS?= =?utf-8?q?c6YFEtsL/sbH?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b2e9388-bb6a-4564-e6ec-08dbbe40bc6d X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 03:29:05.2835 (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: v35RK5Qdo+wJH5CX2GlQvj5hVOIE27rrabEeKzsAsDOFKtRyqWZPttnChHGqim+FtqtFvv71TkRNQ8uMkvCfkw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8436 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Mon, 25 Sep 2023 20:29:29 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778096897499894133 X-GMAIL-MSGID: 1778096897499894133 |
Series |
gpio: update i.MX93/8ULP and support i.MX95
|
|
Commit Message
Peng Fan (OSS)
Sept. 26, 2023, 3:33 a.m. UTC
From: Peng Fan <peng.fan@nxp.com> i.MX8ULP/93 GPIO supports similar feature as i.MX7ULP GPIO, but i.MX8ULP is actually not hardware compatible with i.MX7ULP. i.MX8ULP only has one register base, not two bases. i.MX8ULP and i.MX93 actually has two interrupts for each gpio controller, one for Trustzone non-secure world, one for secure world. Although the Linux Kernel driver gpio-vf610.c could work with fsl,imx7ulp-gpio compatible, it is based on some tricks did in device tree with some offset added to base address. Add a new of_device_id entry for i.MX8ULP. But to make the driver could also support old bindings, check the compatible string first, before check the device data. Signed-off-by: Peng Fan <peng.fan@nxp.com> --- drivers/gpio/gpio-vf610.c | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-)
Comments
On 23-09-26, Peng Fan (OSS) wrote: > From: Peng Fan <peng.fan@nxp.com> > > i.MX8ULP/93 GPIO supports similar feature as i.MX7ULP GPIO, but i.MX8ULP is > actually not hardware compatible with i.MX7ULP. i.MX8ULP only has one > register base, not two bases. i.MX8ULP and i.MX93 actually has two interrupts > for each gpio controller, one for Trustzone non-secure world, one for > secure world. > > Although the Linux Kernel driver gpio-vf610.c could work with > fsl,imx7ulp-gpio compatible, it is based on some tricks did in device tree > with some offset added to base address. > > Add a new of_device_id entry for i.MX8ULP. But to make the driver could > also support old bindings, check the compatible string first, before > check the device data. > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > --- > drivers/gpio/gpio-vf610.c | 40 ++++++++++++++++++++++++++++++++++------ > 1 file changed, 34 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c > index dbc7ba0ee72c..49867d5db642 100644 > --- a/drivers/gpio/gpio-vf610.c > +++ b/drivers/gpio/gpio-vf610.c > @@ -25,6 +25,7 @@ > struct fsl_gpio_soc_data { > /* SoCs has a Port Data Direction Register (PDDR) */ > bool have_paddr; > + bool have_dual_base; > }; > > struct vf610_gpio_port { > @@ -60,13 +61,22 @@ struct vf610_gpio_port { > #define PORT_INT_EITHER_EDGE 0xb > #define PORT_INT_LOGIC_ONE 0xc > > +#define IMX8ULP_GPIO_BASE_OFF 0x40 > +#define IMX8ULP_BASE_OFF 0x80 > + > static const struct fsl_gpio_soc_data imx_data = { > .have_paddr = true, > + .have_dual_base = true, > +}; > + > +static const struct fsl_gpio_soc_data imx8ulp_data = { > + .have_paddr = true, > }; > > static const struct of_device_id vf610_gpio_dt_ids[] = { > { .compatible = "fsl,vf610-gpio", .data = NULL, }, > { .compatible = "fsl,imx7ulp-gpio", .data = &imx_data, }, > + { .compatible = "fsl,imx8ulp-gpio", .data = &imx8ulp_data, }, > { /* sentinel */ } > }; > > @@ -263,19 +273,37 @@ static int vf610_gpio_probe(struct platform_device *pdev) > struct gpio_irq_chip *girq; > int i; > int ret; > + bool dual_base = false; > > port = devm_kzalloc(dev, sizeof(*port), GFP_KERNEL); > if (!port) > return -ENOMEM; > > port->sdata = of_device_get_match_data(dev); > - port->base = devm_platform_ioremap_resource(pdev, 0); > - if (IS_ERR(port->base)) > - return PTR_ERR(port->base); > > - port->gpio_base = devm_platform_ioremap_resource(pdev, 1); > - if (IS_ERR(port->gpio_base)) > - return PTR_ERR(port->gpio_base); > + /* support old compatible strings */ > + 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; Could be simplified even further, if we would add the have_dual_base for the vf610 as well within this patch. dual_base = port->sdata->have_dual_base; /* support old bindings */ 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) { ... Regards, Marco > + if ((port->sdata && port->sdata->have_dual_base) || dual_base) { > + port->base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(port->base)) > + return PTR_ERR(port->base); > + > + port->gpio_base = devm_platform_ioremap_resource(pdev, 1); > + if (IS_ERR(port->gpio_base)) > + return PTR_ERR(port->gpio_base); > + } else { > + port->base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(port->base)) > + return PTR_ERR(port->base); > + > + port->gpio_base = port->base + IMX8ULP_GPIO_BASE_OFF; > + port->base = port->base + IMX8ULP_BASE_OFF; > + } > + > > port->irq = platform_get_irq(pdev, 0); > if (port->irq < 0) > > -- > 2.37.1 > >
> Subject: Re: [PATCH v4 4/7] gpio: vf610: add i.MX8ULP of_device_id entry > > On 23-09-26, Peng Fan (OSS) wrote: > > From: Peng Fan <peng.fan@nxp.com> > > > > i.MX8ULP/93 GPIO supports similar feature as i.MX7ULP GPIO, but > > i.MX8ULP is actually not hardware compatible with i.MX7ULP. i.MX8ULP > > only has one register base, not two bases. i.MX8ULP and i.MX93 > > actually has two interrupts for each gpio controller, one for > > Trustzone non-secure world, one for secure world. > > > > Although the Linux Kernel driver gpio-vf610.c could work with > > fsl,imx7ulp-gpio compatible, it is based on some tricks did in device > > tree with some offset added to base address. > > > > Add a new of_device_id entry for i.MX8ULP. But to make the driver > > could also support old bindings, check the compatible string first, > > before check the device data. > > > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > > --- > > drivers/gpio/gpio-vf610.c | 40 > > ++++++++++++++++++++++++++++++++++------ > > 1 file changed, 34 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c > > index dbc7ba0ee72c..49867d5db642 100644 > > --- a/drivers/gpio/gpio-vf610.c > > +++ b/drivers/gpio/gpio-vf610.c > > @@ -25,6 +25,7 @@ > > struct fsl_gpio_soc_data { > > /* SoCs has a Port Data Direction Register (PDDR) */ > > bool have_paddr; > > + bool have_dual_base; > > }; > > > > struct vf610_gpio_port { > > @@ -60,13 +61,22 @@ struct vf610_gpio_port { > > #define PORT_INT_EITHER_EDGE 0xb > > #define PORT_INT_LOGIC_ONE 0xc > > > > +#define IMX8ULP_GPIO_BASE_OFF 0x40 > > +#define IMX8ULP_BASE_OFF 0x80 > > + > > static const struct fsl_gpio_soc_data imx_data = { > > .have_paddr = true, > > + .have_dual_base = true, > > +}; > > + > > +static const struct fsl_gpio_soc_data imx8ulp_data = { > > + .have_paddr = true, > > }; > > > > static const struct of_device_id vf610_gpio_dt_ids[] = { > > { .compatible = "fsl,vf610-gpio", .data = NULL, }, > > { .compatible = "fsl,imx7ulp-gpio", .data = &imx_data, }, > > + { .compatible = "fsl,imx8ulp-gpio", .data = &imx8ulp_data, }, > > { /* sentinel */ } > > }; > > > > @@ -263,19 +273,37 @@ static int vf610_gpio_probe(struct > platform_device *pdev) > > struct gpio_irq_chip *girq; > > int i; > > int ret; > > + bool dual_base = false; > > > > port = devm_kzalloc(dev, sizeof(*port), GFP_KERNEL); > > if (!port) > > return -ENOMEM; > > > > port->sdata = of_device_get_match_data(dev); > > - port->base = devm_platform_ioremap_resource(pdev, 0); > > - if (IS_ERR(port->base)) > > - return PTR_ERR(port->base); > > > > - port->gpio_base = devm_platform_ioremap_resource(pdev, 1); > > - if (IS_ERR(port->gpio_base)) > > - return PTR_ERR(port->gpio_base); > > + /* support old compatible strings */ > > + 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; > > Could be simplified even further, if we would add the have_dual_base for the > vf610 as well within this patch. ok, need move part of patch 5 into patch 4, Then patch 5 just drop the port->sdata check. Will wait a few days before post V5 in case people has comments on other parts. Thanks, Peng. > > dual_base = port->sdata->have_dual_base; > > /* support old bindings */ > 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) { > ... > > Regards, > Marco > > > + if ((port->sdata && port->sdata->have_dual_base) || dual_base) { > > + port->base = devm_platform_ioremap_resource(pdev, 0); > > + if (IS_ERR(port->base)) > > + return PTR_ERR(port->base); > > + > > + port->gpio_base = devm_platform_ioremap_resource(pdev, > 1); > > + if (IS_ERR(port->gpio_base)) > > + return PTR_ERR(port->gpio_base); > > + } else { > > + port->base = devm_platform_ioremap_resource(pdev, 0); > > + if (IS_ERR(port->base)) > > + return PTR_ERR(port->base); > > + > > + port->gpio_base = port->base + IMX8ULP_GPIO_BASE_OFF; > > + port->base = port->base + IMX8ULP_BASE_OFF; > > + } > > + > > > > port->irq = platform_get_irq(pdev, 0); > > if (port->irq < 0) > > > > -- > > 2.37.1 > > > >
diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c index dbc7ba0ee72c..49867d5db642 100644 --- a/drivers/gpio/gpio-vf610.c +++ b/drivers/gpio/gpio-vf610.c @@ -25,6 +25,7 @@ struct fsl_gpio_soc_data { /* SoCs has a Port Data Direction Register (PDDR) */ bool have_paddr; + bool have_dual_base; }; struct vf610_gpio_port { @@ -60,13 +61,22 @@ struct vf610_gpio_port { #define PORT_INT_EITHER_EDGE 0xb #define PORT_INT_LOGIC_ONE 0xc +#define IMX8ULP_GPIO_BASE_OFF 0x40 +#define IMX8ULP_BASE_OFF 0x80 + static const struct fsl_gpio_soc_data imx_data = { .have_paddr = true, + .have_dual_base = true, +}; + +static const struct fsl_gpio_soc_data imx8ulp_data = { + .have_paddr = true, }; static const struct of_device_id vf610_gpio_dt_ids[] = { { .compatible = "fsl,vf610-gpio", .data = NULL, }, { .compatible = "fsl,imx7ulp-gpio", .data = &imx_data, }, + { .compatible = "fsl,imx8ulp-gpio", .data = &imx8ulp_data, }, { /* sentinel */ } }; @@ -263,19 +273,37 @@ static int vf610_gpio_probe(struct platform_device *pdev) struct gpio_irq_chip *girq; int i; int ret; + bool dual_base = false; port = devm_kzalloc(dev, sizeof(*port), GFP_KERNEL); if (!port) return -ENOMEM; port->sdata = of_device_get_match_data(dev); - port->base = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(port->base)) - return PTR_ERR(port->base); - port->gpio_base = devm_platform_ioremap_resource(pdev, 1); - if (IS_ERR(port->gpio_base)) - return PTR_ERR(port->gpio_base); + /* support old compatible strings */ + 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 ((port->sdata && port->sdata->have_dual_base) || dual_base) { + port->base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(port->base)) + return PTR_ERR(port->base); + + port->gpio_base = devm_platform_ioremap_resource(pdev, 1); + if (IS_ERR(port->gpio_base)) + return PTR_ERR(port->gpio_base); + } else { + port->base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(port->base)) + return PTR_ERR(port->base); + + port->gpio_base = port->base + IMX8ULP_GPIO_BASE_OFF; + port->base = port->base + IMX8ULP_BASE_OFF; + } + port->irq = platform_get_irq(pdev, 0); if (port->irq < 0)