Merge ~vicamo/ubuntu/+source/usbio-drivers:bug-2134604/WW44.4_25_ptl_pv/resolute-mp into ubuntu/+source/usbio-drivers:ubuntu/devel

[You-Sheng Yang]

* New upstream WW44.4_25_ptl_pv tag release (LP: #2134604)
  - debian: refresh patches
  - drop 0004-UBUNTU-SAUCE-correct-modaliases.patch,
    backport-fix-build-against-kernel-6.17.patch as they're either no longer
    effective, or applied in the upstream.
  - UBUNTU: SAUCE: dkms: allow overriding variables from dkms

[You-Sheng Yang (vicamo)]

Also pushed to https://launchpad.net/~vicamo/+archive/ubuntu/sru-2134604 for review/verification.

diff --git a/debian/changelog b/debian/changelog
index 0b5d9f9..16ef5fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+usbio-drivers (0~git202510282139.ee221eca-0ubuntu1) resolute; urgency=medium
+
+  * New upstream WW44.4_25_ptl_pv tag release (LP: #2134604)
+    - debian: refresh patches
+    - drop 0004-UBUNTU-SAUCE-correct-modaliases.patch,
+      backport-fix-build-against-kernel-6.17.patch as they're either no longer
+      effective, or applied in the upstream.
+    - UBUNTU: SAUCE: dkms: allow overriding variables from dkms
+
+ -- You-Sheng Yang <[e-mail]>  Tue, 16 Dec 2025 17:33:05 +0800
+
 usbio-drivers (0~git202502252108.4fb690c6-0ubuntu1) questing; urgency=medium
 
   * New upstream WW11_25_usbio_arl_enable release (LP: #2101850)
diff --git a/debian/patches/0001-dkms-correct-package-info.patch b/debian/patches/0001-dkms-correct-package-info.patch
index af86770..78c094a 100644
--- a/debian/patches/0001-dkms-correct-package-info.patch
+++ b/debian/patches/0001-dkms-correct-package-info.patch
@@ -12,9 +12,9 @@ index 3154c85..3ad44ea 100644
 --- a/dkms.conf
 +++ b/dkms.conf
 @@ -1,5 +1,5 @@
- PACKAGE_NAME="usbio-drivers"
--PACKAGE_VERSION="0.0.1"
+ PACKAGE_NAME="usbio"
+-PACKAGE_VERSION="0.2"
 +PACKAGE_VERSION="#MODULE_VERSION#"
  
- MAKE="make KERNELRELEASE=$kernelver KERNEL_SRC=$kernel_source_dir"
- CLEAN="make KERNELRELEASE=$kernelver KERNEL_SRC=$kernel_source_dir clean"
+ MAKE="make -C . KERNELDIR=/lib/modules/${kernelver}/build"
+ CLEAN="make -C . clean"
diff --git a/debian/patches/0002-dkms-add-BUILD_EXCLUSIVE_CONFIG.patch b/debian/patches/0002-dkms-add-BUILD_EXCLUSIVE_CONFIG.patch
index 681792e..63d0fae 100644
--- a/debian/patches/0002-dkms-add-BUILD_EXCLUSIVE_CONFIG.patch
+++ b/debian/patches/0002-dkms-add-BUILD_EXCLUSIVE_CONFIG.patch
@@ -15,4 +15,4 @@ index 3ad44ea..d61229d 100644
  DEST_MODULE_LOCATION[2]="/updates"
  
  AUTOINSTALL="yes"
-+BUILD_EXCLUSIVE_CONFIG="CONFIG_ACPI CONFIG_GPIOLIB_IRQCHIP CONFIG_I2C CONFIG_MFD_CORE"
++BUILD_EXCLUSIVE_CONFIG="CONFIG_ACPI CONFIG_GPIOLIB_IRQCHIP CONFIG_I2C CONFIG_USB"
diff --git a/debian/patches/0004-UBUNTU-SAUCE-correct-modaliases.patch b/debian/patches/0004-UBUNTU-SAUCE-correct-modaliases.patch
deleted file mode 100644
index ec2224b..0000000
--- a/debian/patches/0004-UBUNTU-SAUCE-correct-modaliases.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: You-Sheng Yang <[e-mail]>
-Date: Fri, 23 Aug 2024 00:08:36 +0800
-Subject: UBUNTU: SAUCE: correct modaliases
-
-Signed-off-by: You-Sheng Yang <[e-mail]>
----
- drivers/gpio/gpio-usbio.c      | 2 +-
- drivers/i2c/busses/i2c-usbio.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpio/gpio-usbio.c b/drivers/gpio/gpio-usbio.c
-index d5635c0..e4b12e9 100644
---- a/drivers/gpio/gpio-usbio.c
-+++ b/drivers/gpio/gpio-usbio.c
-@@ -513,4 +513,4 @@ MODULE_AUTHOR("Israel Cepeda <[e-mail]>");
- MODULE_AUTHOR("Lifu Wang <[e-mail]>");
- MODULE_DESCRIPTION("Intel USBIO-GPIO driver");
- MODULE_LICENSE("GPL v2");
--MODULE_ALIAS("platform:usb-gpio");
-+MODULE_ALIAS("platform:usbio-gpio");
-diff --git a/drivers/i2c/busses/i2c-usbio.c b/drivers/i2c/busses/i2c-usbio.c
-index be49697..17063d5 100644
---- a/drivers/i2c/busses/i2c-usbio.c
-+++ b/drivers/i2c/busses/i2c-usbio.c
-@@ -428,4 +428,4 @@ MODULE_AUTHOR("Israel Cepeda <[e-mail]>");
- MODULE_AUTHOR("Lifu Wang <[e-mail]>");
- MODULE_DESCRIPTION("Intel USBIO-I2C driver");
- MODULE_LICENSE("GPL v2");
--MODULE_ALIAS("platform:usb-i2c");
-+MODULE_ALIAS("platform:usbio-i2c");
diff --git a/debian/patches/backport-fix-build-against-kernel-6.17.patch b/debian/patches/backport-fix-build-against-kernel-6.17.patch
deleted file mode 100644
index c0f8dfd..0000000
--- a/debian/patches/backport-fix-build-against-kernel-6.17.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: You-Sheng Yang <[e-mail]>
-Date: Wed, 13 Aug 2025 14:58:19 +0800
-Subject: backport: fix build against kernel >= 6.17
-
-v6.17-rc1 commit 98ce1eb1fd87e ("gpiolib: introduce gpio_chip setters
-that return values") added two new APIs `set_rv` and `set_multiple_rv`
-to `struct gpio_irq_chip` that duplicate existing `set` and
-`set_multiple` without return values. They then completely replace the
-no-return-value APIs in same v6.17-rc1 commit d9d87d90cc0b1
-("treewide: rename GPIO set callbacks back to their original names").
-
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/2120461
-Forwarded: https://github.com/intel/usbio-drivers/pull/38
-Signed-off-by: You-Sheng Yang <[e-mail]>
----
- drivers/gpio/gpio-usbio.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpio/gpio-usbio.c b/drivers/gpio/gpio-usbio.c
-index de9d5cb..053fa32 100644
---- a/drivers/gpio/gpio-usbio.c
-+++ b/drivers/gpio/gpio-usbio.c
-@@ -175,8 +175,13 @@ static int usbio_gpio_get_value(struct gpio_chip *chip, unsigned int offset)
- 	return usbio_gpio_read(usbio_gpio, offset);
- }
- 
--static void usbio_gpio_set_value(struct gpio_chip *chip, unsigned int offset,
--				int val)
-+static
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 17, 0)
-+void
-+#else
-+int
-+#endif
-+usbio_gpio_set_value(struct gpio_chip *chip, unsigned int offset, int val)
- {
- 	struct usbio_gpio_dev *usbio_gpio = gpiochip_get_data(chip);
- 	int ret;
-@@ -186,6 +191,10 @@ static void usbio_gpio_set_value(struct gpio_chip *chip, unsigned int offset,
- 		dev_err(chip->parent,
- 			"%s offset:%d val:%d set value failed %d\n", __func__,
- 			offset, val, ret);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
-+	return ret;
-+#endif
- }
- 
- static int usbio_gpio_direction_input(struct gpio_chip *chip,
diff --git a/debian/patches/dkms-allow-overriding-variables-from-dkms.patch b/debian/patches/dkms-allow-overriding-variables-from-dkms.patch
new file mode 100644
index 0000000..5fedfab
--- /dev/null
+++ b/debian/patches/dkms-allow-overriding-variables-from-dkms.patch
@@ -0,0 +1,41 @@
+From: You-Sheng Yang <[e-mail]>
+Date: Tue, 16 Dec 2025 17:19:33 +0800
+Subject: UBUNTU: SAUCE: dkms: allow overriding variables from dkms
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2134604
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ Makefile  | 4 ++--
+ dkms.conf | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d1207e1..28366ba 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,8 +10,8 @@ gpio-usbio-y := drivers/gpio/gpio-usbio.o
+ obj-m += i2c-usbio.o
+ i2c-usbio-y := drivers/i2c/busses/i2c-usbio.o
+ 
+-KERNELRELEASE := $(shell uname -r)
+-KDIR := /lib/modules/$(KERNELRELEASE)/build
++KERNELRELEASE ?= $(shell uname -r)
++KDIR ?= /lib/modules/$(KERNELRELEASE)/build
+ PWD := $(shell pwd)
+ 
+ ccflags-y += -I$(src)/include/
+diff --git a/dkms.conf b/dkms.conf
+index 477d38c..7a0daec 100644
+--- a/dkms.conf
++++ b/dkms.conf
+@@ -1,8 +1,8 @@
+ PACKAGE_NAME="usbio"
+ PACKAGE_VERSION="#MODULE_VERSION#"
+ 
+-MAKE="make -C . KERNELDIR=/lib/modules/${kernelver}/build"
+-CLEAN="make -C . clean"
++MAKE="make KERNELRELEASE=$kernelver KDIR=$kernel_source_dir"
++CLEAN="make KERNELRELEASE=$kernelver KDIR=$kernel_source_dir clean"
+ 
+ BUILT_MODULE_NAME[0]="usbio"
+ DEST_MODULE_LOCATION[0]="/updates"
diff --git a/debian/patches/series b/debian/patches/series
index 65599f2..1700245 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-dkms-correct-package-info.patch
 0002-dkms-add-BUILD_EXCLUSIVE_CONFIG.patch
-0004-UBUNTU-SAUCE-correct-modaliases.patch
-backport-fix-build-against-kernel-6.17.patch
+dkms-allow-overriding-variables-from-dkms.patch