Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
From:   "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
Date:   Mon, 18 Sep 2023 16:16:08 +0800
Subject: [PATCH v3 4/6] gpio: vf610: add i.MX8ULP of_device_id entry
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20230918-vf610-gpio-v3-4-ada82a17adc5@nxp.com>
References: <20230918-vf610-gpio-v3-0-ada82a17adc5@nxp.com>
In-Reply-To: <20230918-vf610-gpio-v3-0-ada82a17adc5@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>
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>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|VI1PR04MB7133:EE_
X-MS-Office365-Filtering-Correlation-Id: b5b6d033-be69-4447-8f9d-08dbb81ef150
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: 1WjqIuLTAAoZKtaXw448QH20EBKaftx8oFqSOfoTnhqAYfuEoTPC0GJE8qWhpdWzC/cyhbzRJuT6g4lB94rpMWZWnZDItT0KL8brhth7h72CRI7k3P5zcc0K1paLiIzx2ORaEX9BWTZE/9c73NUaVvUA6YTOVCyglYzA57KtpdpkBsFtmkyn7p6CIDLMDvl3FE0fVv1+GBeJHXHSUwSSfGf8ESCsdydhVTCjCwST8xVu3DN2ct+3Bj4ORW4zWek9EjBvf/KH5k+2rtRIiJ6VT1xslXuvOGxXxYLUnrwdtP9aRA5wQfkx3B74puo/3tnPd0Ns6vVdXEr78SVCvvfUptWYV0BdPp0JvY9Bnj3GZWAGhn+D3EuvvEmhttiIH1sb99W6McnJdnl6ZlDx3bSmprxvf0LWGWHL0R3EKU5wdqvXPK4uVm+WqAlHFjNFnSAGV8YcaVWkxYfhrFWOyDA25orjNVSDJtg3+OaRRbpspOhZioMOx1lxAZLf0iwotfqWKCzgeGB35tcdzpWXl5Xh8zX5irYuDErDVHSLbDEoROtWBpOHuJt805mpwPd3LZJCIoidUb2PqmJBaLKzb21DSt5hFixRu0xmsYKQbWkhBGizuUtPFKCAcDinjz9pbnLhnru0IEJ6RkUURzjNKAj//A==
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)(346002)(376002)(39860400002)(396003)(366004)(136003)(186009)(1800799009)(451199024)(2906002)(7416002)(5660300002)(8936002)(4326008)(8676002)(26005)(41300700001)(316002)(66476007)(66946007)(66556008)(110136005)(478600001)(36756003)(52116002)(6486002)(6506007)(83380400001)(6512007)(9686003)(38100700002)(38350700002)(921005)(86362001);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UElkS1NGS3BKWS9tbkhPeDNaci8zRGN3czZYclhkb1BKck1EbVZRUWk3SWU1?=
 =?utf-8?B?YXlXRUlic2V1U2Fpb01aMklsREozN04xd1V6Z21jdm9YOVgzWUN0U2Flb1gy?=
 =?utf-8?B?bWRwUDlIbzNkdVo2TnNOZTR1TDFNRWlLUVNxdmIxaGxsNkUwcXZZS3JLMGlS?=
 =?utf-8?B?cWpXZUlWWnhjeG1TSWNOTzl2N3krKzhBVXJncUFva3RoVXh0RlNQR1dVS215?=
 =?utf-8?B?cjl2OUtDMjR4NEFZSjNHL0E1ZEtJNXdLb0VBUHJ2cVMxSXZDcWdTMFZQYjJB?=
 =?utf-8?B?UWg1U0IrKzFQMkhSLytQWitFMTY4U3J5elRkNmZ6L05QOGJOSzZkTlJtbHVQ?=
 =?utf-8?B?MkxLZTlVRjlXUDdNdXh1ejhWQUl1dmVqYVl6MjNwL21sZ1lKS09hdFNrbk9R?=
 =?utf-8?B?QmV0b2dESmhIUjhnWGNFNm1pcVVYaThOVnRvQUhtQmVSOFFQdUJsVnpVUDRV?=
 =?utf-8?B?T1FJTUtmaHZ3OUpEcFZkNzJkUTV0ZXhuWVA2WU1XcE1rZTRtdU9hWHRzZjE1?=
 =?utf-8?B?S0RBU2Uzd0UwaDRKR2x0amFJUHNUcmhwSlNOMEFvYUdHMzg1cWhpN0M3V3Bv?=
 =?utf-8?B?Tm45b25pcDEzci8vQWJTRUVxMkZUdGRnTHc4QXlBRkMzOERjc1krS2krenpB?=
 =?utf-8?B?MzVTTnVwRVhDRjJWMTJ2ZjhhM2xRMzFuQlRGdWhnK3JCOU1zVmhlbDdFRWo4?=
 =?utf-8?B?Y2REalh2NjBzZzBSWEI0bFFTRk1kOG41L1JaQXJLMjV1eUcyeVFLMHdXK2NT?=
 =?utf-8?B?MkpDbDArLzU4QTZ5NUJOMFVQbU1xbTVERmRta20ybFMyTG5YYXdreHJsUE5l?=
 =?utf-8?B?ajNVN1liN25xcFlwdHgrMHV4c1lHSURoQmVDUG5wOW1HOStCWUVKbFQveXRu?=
 =?utf-8?B?a2hvWVQ4TGJSdVY0Z0ZBbHZyZEZYQ0NBQUlqVGRmNXBsajErM0lHdEVXOXRZ?=
 =?utf-8?B?dTlsQkowKzZHTFFpRFJiZDFWT05KQ2V5VzlPOWRZdkpxdk9INC9tVVNNelN4?=
 =?utf-8?B?WlhuSlZqODVPeHJoMDJkbk14MldwaEhGM1UwTEF1NHFucGRoUDZPckVQZG5a?=
 =?utf-8?B?RVpyVVQ4STMyRkd3YVBPZ3ZybnFGRityK2djMkdCYXFjeVFOQW51cURQZWxj?=
 =?utf-8?B?R3FsMXM5THdlWUR3TWtvRm1lMVkwSEZzVmNaSExsbnZIcGhDZDlGT2xXck8x?=
 =?utf-8?B?cFlncDVBV3ViTmRVTlROQ1dlSUFNNjlITGozdUl6dkNnb3NoOGdOSFhLYjRO?=
 =?utf-8?B?ZDd3bG5wWEJIeHJ3dDBJWXNYcnZ5Z1lUK0JYbit0V1k3WEw5L0NKSmUyOTV0?=
 =?utf-8?B?cmlBV3BjSnV3WTg5UXhvczJXaGdibU5XRmJjQ3doeGVPTVhiTTgzbDh5WEw1?=
 =?utf-8?B?djdxWHRhRUtUODBSQ0ZlT2RtWVFkbXpCOFV4RWdOOWc0Q0xxYmJtTzdUZFYr?=
 =?utf-8?B?WXRQSk1RWkNFZE1rOVdYM2V1UmYrT29BUU5YTHl0dUtpd2ErRXhNS21UcTQ1?=
 =?utf-8?B?dDY1L0Q2eFVHTjNSQkk0c0IvbWR5N2xwN0hiQVdxcU9TV1VwQVowWG1pZHJT?=
 =?utf-8?B?bEUreVplSUVsSUt2OE5iSURhOW16eVNFRmZISVROazFMY1NoN3o3QzFyd0dB?=
 =?utf-8?B?TmQxSUErYmM2Y2dpYXMzQ04rU0V0UEtDYlphcUdMVjNpYkc3akV1OXowblNT?=
 =?utf-8?B?b2VkQnk3Z0hFOTNTRVpVRjV2d2VkSGFOOEFGdFBUYXJiUEdObXJ1N1BPL0dB?=
 =?utf-8?B?ZjdiczFsQ1p3TzdnKzBtWnhITlJFR1h4Wmc0a1lpaEZ1YnAyYWtEUzJFeTlJ?=
 =?utf-8?B?K1F4SkpTRi85VUFIREkveWxUbFV2TnI2ODhyeXYvOSsxc2tZaWtJM2tWMThP?=
 =?utf-8?B?VGUzQkx0a3lhS0FMc0JjTUIrQVpsTWlnRUp2M3ZxbmI2OUQrejdNMVV1Q0hv?=
 =?utf-8?B?Y3Awc0ZVT1FJaTlIWmUwOXMzU1ltU3ZiVkJYWmVyamFYSHJ5aGV3WjM2ZHNX?=
 =?utf-8?B?NTVYbHdsSGllK0hTUFZrREdycEhaUGYyRzlQalRic25PK0xETDl3VWdzWWxM?=
 =?utf-8?B?MWRlYXpjaFloZHpCUko0T0d5NDNUMlJVc0M5T0o2RXZPS2JMMmYzTFg5d2tM?=
 =?utf-8?Q?Yjuldwi9fBnzza8F+XfpDYzke?=
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b5b6d033-be69-4447-8f9d-08dbb81ef150
X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2023 08:12:04.1753
 (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: l/lmeqamCOyBvFwx78/9xnFsJEUbtt9I6bYQnEHcflzo4GpF3vYGgAU9sCztOFS6en5chs7Uz5h5HFui/Sl0+A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7133
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, 18 Sep 2023 01:15:20 -0700 (PDT)

From: Peng Fan <peng.fan@nxp.com>

i.MX8ULP GPIO supports similar feature as i.MX7ULP GPIO, but i.MX8ULP is
not compatible with i.MX7ULP per binding doc. i.MX8ULP only has one
register base, not two base.

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 | 55 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 49 insertions(+), 6 deletions(-)

diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c
index dbc7ba0ee72c..ef2455093708 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 is_imx8ulp;
 };
 
 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,
 };
 
+static const struct fsl_gpio_soc_data imx8ulp_data = {
+	.have_paddr = true,
+	.is_imx8ulp = 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 */ }
 };
 
@@ -255,6 +265,42 @@ static void vf610_gpio_disable_clk(void *data)
 	clk_disable_unprepare(data);
 }
 
+static int vf610_gpio_map_base(struct platform_device *pdev, struct vf610_gpio_port *port)
+{
+	struct device *dev = &pdev->dev;
+	bool dual_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;
+	} else if (port->sdata && port->sdata->is_imx8ulp) {
+		dual_base = false;
+	} else {
+		dual_base = true;
+	};
+
+	if (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;
+	}
+
+	return 0;
+}
+
 static int vf610_gpio_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
@@ -269,13 +315,10 @@ static int vf610_gpio_probe(struct platform_device *pdev)
 		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);
+	ret = vf610_gpio_map_base(pdev, port);
+	if (ret)
+		return ret;
 
 	port->irq = platform_get_irq(pdev, 0);
 	if (port->irq < 0)

-- 
2.37.1