From 6fcf226b9636e6dae0bfac5b3634a232786794e8 Mon Sep 17 00:00:00 2001
From: Laxman Dewangan <ldewangan@nvidia.com>
Date: Sun, 10 Dec 2023 12:55:40 +0000
Subject: [PATCH] cdi_gpio: Enable build of cdi_gpio for Linux 6.2

The build of cdi_gpio driver was disabled for Linux 6.2
as there is change in API in core kernel.

Enable build of cdi_gpio driver with appropriate
modification in driver for Linux 6.2.

Bug 4346767

Change-Id: If2d67a87a37bb868b217346d0dbfb5d56e4617e1
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3031552
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
---
 drivers/media/platform/tegra/cdi/Makefile   |  2 --
 drivers/media/platform/tegra/cdi/cdi_gpio.c | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/tegra/cdi/Makefile b/drivers/media/platform/tegra/cdi/Makefile
index 55df7d95..02fabbda 100644
--- a/drivers/media/platform/tegra/cdi/Makefile
+++ b/drivers/media/platform/tegra/cdi/Makefile
@@ -1,9 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 # Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
-ifneq ($(CONFIG_TEGRA_GPIO_LEGACY_DISABLE),y)
 obj-m	+= cdi_gpio.o
-endif
 obj-m	+= cdi_mgr.o
 obj-m	+= cdi_dev.o
 obj-m	+= cdi_pwm.o
diff --git a/drivers/media/platform/tegra/cdi/cdi_gpio.c b/drivers/media/platform/tegra/cdi/cdi_gpio.c
index 4b7b9856..579721e5 100644
--- a/drivers/media/platform/tegra/cdi/cdi_gpio.c
+++ b/drivers/media/platform/tegra/cdi/cdi_gpio.c
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
 // Copyright (c) 2017-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
+#include <nvidia/conftest.h>
+
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/of.h>
@@ -40,6 +42,9 @@ static struct gpio_chip *cdi_gpio_get_chip(struct platform_device *pdev,
 						struct cdi_gpio_plat_data *pd)
 {
 	struct gpio_chip *gc = NULL;
+#if !defined(NV_GPIOCHIP_FIND_PRESENT) /* Linux 6.7 */
+	struct gpio_device *gdev;
+#endif
 	char name[MAX_STR_SIZE];
 
 	if (strlen(pd->gpio_prnt_chip) > MAX_STR_SIZE) {
@@ -49,7 +54,15 @@ static struct gpio_chip *cdi_gpio_get_chip(struct platform_device *pdev,
 	}
 	strcpy(name, pd->gpio_prnt_chip);
 
+#if defined(NV_GPIOCHIP_FIND_PRESENT) /* Linux 6.7 */
 	gc = gpiochip_find(name, cdi_gpio_chip_match);
+#else
+	gdev = gpio_device_find(name, cdi_gpio_chip_match);
+	if (gdev) {
+		gc = gpio_device_get_chip(gdev);
+		gpio_device_put(gdev);
+	}
+#endif
 	if (!gc) {
 		dev_err(&pdev->dev, "%s: unable to find gpio parent chip %s\n",
 			__func__, pd->gpio_prnt_chip);
@@ -275,7 +288,9 @@ static int cdi_gpio_probe(struct platform_device *pdev)
 	gc->base = -1;
 	gc->ngpio = pd->max_gpio;
 	gc->label = "cdi-gpio";
+#if defined(NV_GPIO_CHIP_STRUCT_HAS_OF_NODE_PRESENT) /* Linux 6.2 */
 	gc->of_node = pdev->dev.of_node;
+#endif
 	gc->owner = THIS_MODULE;
 
 	err = gpiochip_add_data(gc, cdi_gpio);