6.18-stable patches

added patches:
	revert-gpio-swnode-don-t-use-the-swnode-s-name-as-the-key-for-gpio-lookup.patch

diff --git a/queue-6.18/revert-gpio-swnode-don-t-use-the-swnode-s-name-as-the-key-for-gpio-lookup.patch b/queue-6.18/revert-gpio-swnode-don-t-use-the-swnode-s-name-as-the-key-for-gpio-lookup.patch
new file mode 100644 (file)
index 0000000..6530fe2
--- /dev/null
+++ b/queue-6.18/revert-gpio-swnode-don-t-use-the-swnode-s-name-as-the-key-for-gpio-lookup.patch
@@ -0,0 +1,44 @@
+From ckeepax@opensource.cirrus.com  Tue Jan  6 17:23:53 2026
+From: Charles Keepax <ckeepax@opensource.cirrus.com>
+Date: Tue,  6 Jan 2026 15:53:21 +0000
+Subject: Revert "gpio: swnode: don't use the swnode's name as the key for GPIO lookup"
+To: stable@vger.kernel.org
+Cc: linusw@kernel.org, brgl@bgdev.pl, patches@opensource.cirrus.com
+Message-ID: <20260106155321.1499887-1-ckeepax@opensource.cirrus.com>
+
+From: Charles Keepax <ckeepax@opensource.cirrus.com>
+
+This reverts commit e5d527be7e6984882306b49c067f1fec18920735.
+
+This software node change doesn't actually fix any current issues
+with the kernel, it is an improvement to the lookup process rather
+than fixing a live bug. It also causes a couple of regressions with
+shipping laptops, which relied on the label based lookup.
+
+There is a fix for the regressions in mainline, the first 5 patches
+of [1]. However, those patches are fairly substantial changes and
+given the patch causing the regression doesn't actually fix a bug
+it seems better to just revert it in stable.
+
+CC: stable@vger.kernel.org # 6.18
+Link: https://lore.kernel.org/linux-sound/20251120-reset-gpios-swnodes-v7-0-a100493a0f4b@linaro.org/ [1]
+Closes: https://github.com/thesofproject/linux/issues/5599
+Closes: https://github.com/thesofproject/linux/issues/5603
+Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
+Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpio/gpiolib-swnode.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpio/gpiolib-swnode.c
++++ b/drivers/gpio/gpiolib-swnode.c
+@@ -41,7 +41,7 @@ static struct gpio_device *swnode_get_gp
+           !strcmp(gdev_node->name, GPIOLIB_SWNODE_UNDEFINED_NAME))
+               return ERR_PTR(-ENOENT);
+ 
+-      gdev = gpio_device_find_by_fwnode(fwnode);
++      gdev = gpio_device_find_by_label(gdev_node->name);
+       return gdev ?: ERR_PTR(-EPROBE_DEFER);
+ }
+ 

diff --git a/queue-6.18/series b/queue-6.18/series
index ec1d4d3a803b3254e412c62bfa0df9009d061a34..5830d48ec30dcd1c0bfc99e24cc5168f9567f521 100644 (file)
--- a/queue-6.18/series
+++ b/queue-6.18/series
@@ -309,3 +309,4 @@ powercap-intel_rapl-add-support-for-nova-lake-processors.patch
 loongarch-bpf-enhance-the-bpf_arch_text_poke-function.patch
 vfio-pci-disable-qword-access-to-the-pci-rom-bar.patch
 mm-damon-tests-core-kunit-handle-alloc-failures-on-damon_test_split_regions_of.patch
+revert-gpio-swnode-don-t-use-the-swnode-s-name-as-the-key-for-gpio-lookup.patch