From: Greg Kroah-Hartman Date: Thu, 8 Jan 2026 08:21:30 +0000 (+0100) Subject: 6.18-stable patches X-Git-Tag: v6.12.64~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a73697b2acb9e2c77c7b6300f4df89757b92e833;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 0000000000..6530fe2081 --- /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 +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 + +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 +Signed-off-by: Charles Keepax +Signed-off-by: Greg Kroah-Hartman +--- + 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 ec1d4d3a80..5830d48ec3 100644 --- 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