From: Greg Kroah-Hartman Date: Thu, 27 Nov 2025 15:02:49 +0000 (+0100) Subject: 6.12-stable patches X-Git-Tag: v6.6.118~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f951ca67f55485e17e90e5945b999b7c596a4ff0;p=thirdparty%2Fkernel%2Fstable-queue.git 6.12-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.12/revert-gpio-swnode-don-t-use-the-swnode-s-name-as-the-key-for-gpio-lookup.patch b/queue-6.12/revert-gpio-swnode-don-t-use-the-swnode-s-name-as-the-key-for-gpio-lookup.patch new file mode 100644 index 0000000000..0a5d4a2b3f --- /dev/null +++ b/queue-6.12/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 Thu Nov 27 16:02:06 2025 +From: Charles Keepax +Date: Tue, 25 Nov 2025 10:29:24 +0000 +Subject: Revert "gpio: swnode: don't use the swnode's name as the key for GPIO lookup" +To: stable@vger.kernel.org +Cc: linus.walleij@linaro.org, brgl@bgdev.pl, patches@opensource.cirrus.com +Message-ID: <20251125102924.3612459-1-ckeepax@opensource.cirrus.com> + +From: Charles Keepax + +This reverts commit 25decf0469d4c91d90aa2e28d996aed276bfc622. + +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.12, 6.17 +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.12/series b/queue-6.12/series index 7ce6fd5b27..5823d0b498 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -110,3 +110,4 @@ drm-amd-display-avoid-reset-dtbclk-at-clock-init.patch drm-amd-display-disable-dpp-rcg-before-dpp-clk-enable.patch drm-amd-display-insert-dccg-log-for-easy-debug.patch drm-amd-display-prevent-gating-dtbclk-before-it-is-properly-latched.patch +revert-gpio-swnode-don-t-use-the-swnode-s-name-as-the-key-for-gpio-lookup.patch