Merge ~vicamo/ubuntu/+source/vision-drivers:bug-2134604/upstream-WW46.3_25_ptl_pv-release/resolute/mp into ubuntu/+source/vision-drivers:ubuntu/devel

[You-Sheng Yang]

* New upstream WW46.3_25_ptl_pv tag release (LP: #2134604)

* Fix build failures against old kernels
  - backport: fix build against kernels < v6.11
  - backport: fix build against kernels < v6.3
  - backport: fix build against kernels < v6.1
  - dkms: specify BUILD_EXCLUSIVE_KERNEL_MIN

diff --git a/debian/changelog b/debian/changelog
index f5b62a0..48dbe50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+vision-drivers (0~git202511121832.a8d772f2-0ubuntu1) resolute; urgency=medium
+
+  * New upstream WW46.3_25_ptl_pv tag release (LP: #2134604)
+
+  * Fix build failures against old kernels
+    - backport: fix build against kernels < v6.11
+    - backport: fix build against kernels < v6.3
+    - backport: fix build against kernels < v6.1
+    - dkms: specify BUILD_EXCLUSIVE_KERNEL_MIN
+
+ -- You-Sheng Yang <[e-mail]>  Tue, 16 Dec 2025 18:02:32 +0800
+
 vision-drivers (0~git202506061730.92a717e0-0ubuntu1) questing; urgency=medium
 
   * New upstream ww23_25_ptl_post_Beta_Vision tag release (LP: #2101850)
diff --git a/debian/patches/backport-fix-build-against-kernels-v6.1.patch b/debian/patches/backport-fix-build-against-kernels-v6.1.patch
new file mode 100644
index 0000000..a4f39dd
--- /dev/null
+++ b/debian/patches/backport-fix-build-against-kernels-v6.1.patch
@@ -0,0 +1,34 @@
+From: You-Sheng Yang <[e-mail]>
+Date: Tue, 16 Dec 2025 21:11:14 +0800
+Subject: backport: fix build against kernels < v6.1
+
+v6.1-rc1 commit ed5c2f5fd10dd ("i2c: Make remove callback return void")
+brings this kernel i2c driver API change.
+
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ drivers/misc/icvs/intel_cvs.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/drivers/misc/icvs/intel_cvs.c b/drivers/misc/icvs/intel_cvs.c
+index 4b6b8f0..f2fd314 100644
+--- a/drivers/misc/icvs/intel_cvs.c
++++ b/drivers/misc/icvs/intel_cvs.c
+@@ -255,9 +255,17 @@ static void cvs_common_remove(struct device *dev, bool is_i2c)
+ 	}
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)
++static int cvs_i2c_remove(struct i2c_client *i2c)
++#else
+ static void cvs_i2c_remove(struct i2c_client *i2c)
++#endif
+ {
+ 	cvs_common_remove(&i2c->dev, true);
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)
++	return 0;
++#endif
+ }
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
diff --git a/debian/patches/backport-fix-build-against-kernels-v6.11.patch b/debian/patches/backport-fix-build-against-kernels-v6.11.patch
new file mode 100644
index 0000000..237f1e5
--- /dev/null
+++ b/debian/patches/backport-fix-build-against-kernels-v6.11.patch
@@ -0,0 +1,42 @@
+From: You-Sheng Yang <[e-mail]>
+Date: Tue, 16 Dec 2025 18:33:25 +0800
+Subject: backport: fix build against kernels < v6.11
+
+v6.11-rc1 commit 0edb555a65d1e ("platform: Make platform_driver::remove()
+return void") causes build failure.
+
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ drivers/misc/icvs/intel_cvs.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/drivers/misc/icvs/intel_cvs.c b/drivers/misc/icvs/intel_cvs.c
+index e85652b..0fb0420 100644
+--- a/drivers/misc/icvs/intel_cvs.c
++++ b/drivers/misc/icvs/intel_cvs.c
+@@ -14,6 +14,7 @@
+ #include <linux/fs.h>
+ #include <linux/file.h>
+ #include <linux/vmalloc.h>
++#include <linux/version.h>
+ 
+ #include "cvs_gpio.h"
+ #include "intel_cvs_update.h"
+@@ -259,9 +260,17 @@ static void cvs_i2c_remove(struct i2c_client *i2c)
+ 	cvs_common_remove(&i2c->dev, true);
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
++static int cvs_platform_remove(struct platform_device *pdev)
++#else
+ static void cvs_platform_remove(struct platform_device *pdev)
++#endif
+ {
+ 	cvs_common_remove(&pdev->dev, false);
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
++	return 0;
++#endif
+ }
+ 
+ int cvs_read_i2c(u16 cmd, char *data, int size)
diff --git a/debian/patches/backport-fix-build-against-kernels-v6.3.patch b/debian/patches/backport-fix-build-against-kernels-v6.3.patch
new file mode 100644
index 0000000..009da67
--- /dev/null
+++ b/debian/patches/backport-fix-build-against-kernels-v6.3.patch
@@ -0,0 +1,28 @@
+From: You-Sheng Yang <[e-mail]>
+Date: Tue, 16 Dec 2025 21:02:44 +0800
+Subject: backport: fix build against kernels < v6.3
+
+v6.3-rc2 commit 03c835f498b54 ("i2c: Switch .probe() to not take an id
+parameter") removed the second id parameter.
+
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ drivers/misc/icvs/intel_cvs.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/misc/icvs/intel_cvs.c b/drivers/misc/icvs/intel_cvs.c
+index 0fb0420..4b6b8f0 100644
+--- a/drivers/misc/icvs/intel_cvs.c
++++ b/drivers/misc/icvs/intel_cvs.c
+@@ -743,7 +743,11 @@ static struct i2c_driver cvs_i2c_driver = {
+ 		.dev_groups = cvs_groups,
+ 		.pm = pm_ptr(ICVS_DEV_PM_OPS),
+ 	},
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
++	.probe_new = cvs_i2c_probe,
++#else
+ 	.probe = cvs_i2c_probe,
++#endif
+ 	.remove = cvs_i2c_remove
+ };
+ 
diff --git a/debian/patches/dkms-specify-BUILD_EXCLUSIVE_KERNEL_MIN.patch b/debian/patches/dkms-specify-BUILD_EXCLUSIVE_KERNEL_MIN.patch
new file mode 100644
index 0000000..4b56af6
--- /dev/null
+++ b/debian/patches/dkms-specify-BUILD_EXCLUSIVE_KERNEL_MIN.patch
@@ -0,0 +1,21 @@
+From: You-Sheng Yang <[e-mail]>
+Date: Tue, 16 Dec 2025 22:58:14 +0800
+Subject: dkms: specify BUILD_EXCLUSIVE_KERNEL_MIN
+
+The implementation depends on SYSTEM_SLEEP_PM_OPS macro that was
+introduced in v5.17-rc1.
+
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ dkms.conf | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/dkms.conf b/dkms.conf
+index 838f518..38de437 100644
+--- a/dkms.conf
++++ b/dkms.conf
+@@ -9,3 +9,4 @@ DEST_MODULE_LOCATION[0]="/updates"
+ 
+ AUTOINSTALL="yes"
+ BUILD_EXCLUSIVE_CONFIG="CONFIG_ACPI CONFIG_GPIOLIB CONFIG_I2C"
++BUILD_EXCLUSIVE_KERNEL_MIN="5.17"
diff --git a/debian/patches/series b/debian/patches/series
index d12c740..f46ec61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,6 @@
 0001-dkms-use-debian-package-version-as-PACKAGE_VERSION.patch
 0002-dkms-add-BUILD_EXCLUSIVE_CONFIG.patch
+backport-fix-build-against-kernels-v6.11.patch
+backport-fix-build-against-kernels-v6.3.patch
+backport-fix-build-against-kernels-v6.1.patch
+dkms-specify-BUILD_EXCLUSIVE_KERNEL_MIN.patch