From af59e64885d619852fa897c3a34d5609ae4fa4f4 Mon Sep 17 00:00:00 2001
From: Jon Hunter <jonathanh@nvidia.com>
Date: Mon, 12 Jun 2023 10:39:22 +0100
Subject: [PATCH] media: lt6911uxc: Fix build for Linux v6.3

Upstream Linux commit 03c835f498b5 ("i2c: Switch .probe() to not
take an id parameter") removes the 'id' argument from the I2C probe
callback. Update the ov5693 driver, which defines an I2C probe callback
function, to fix building the driver for Linux v6.3.

Bug 4014315

Change-Id: I8c8954b7c1e1e322fb3f560f6348caac54e5e43d
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2919423
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
---
 drivers/media/i2c/lt6911uxc.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/media/i2c/lt6911uxc.c b/drivers/media/i2c/lt6911uxc.c
index e47857a7..7ac7abbc 100644
--- a/drivers/media/i2c/lt6911uxc.c
+++ b/drivers/media/i2c/lt6911uxc.c
@@ -12,6 +12,7 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
+#include <linux/version.h>
 
 #include <media/tegra_v4l2_camera.h>
 #include <media/tegracam_core.h>
@@ -436,8 +437,12 @@ static struct camera_common_sensor_ops lt6911uxc_common_ops = {
 };
 
 
+#if KERNEL_VERSION(6, 3, 0) <= LINUX_VERSION_CODE
+static int lt6911uxc_probe(struct i2c_client *client)
+#else
 static int lt6911uxc_probe(struct i2c_client *client,
 	const struct i2c_device_id *id)
+#endif
 {
 	struct device *dev = &client->dev;
 	struct tegracam_device *tc_dev;