From: Greg Kroah-Hartman Date: Tue, 21 Jul 2026 08:05:49 +0000 (+0200) Subject: drop queue-5.15/dmaengine-imx-sdma-refine-spba-bus-searching-in-prob.patch X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f0c16b8217ab245b60680337e3d9ed1ab4a3bbf;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.15/dmaengine-imx-sdma-refine-spba-bus-searching-in-prob.patch brokethe build --- diff --git a/queue-5.15/dmaengine-imx-sdma-refine-spba-bus-searching-in-prob.patch b/queue-5.15/dmaengine-imx-sdma-refine-spba-bus-searching-in-prob.patch deleted file mode 100644 index 1031446f7c..0000000000 --- a/queue-5.15/dmaengine-imx-sdma-refine-spba-bus-searching-in-prob.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 34301864fd7107d0a7a4f9e2a466c09847475d56 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 7 Apr 2026 11:27:55 +0800 -Subject: dmaengine: imx-sdma: Refine spba bus searching in probe - -From: Shengjiu Wang - -[ Upstream commit d52d42e2e5d9f13166e81ac837ebb023d1306e61 ] - -There are multi spba-busses for i.MX8M* platforms, if only search for -the first spba-bus in DT, the found spba-bus may not the real bus of -audio devices, which cause issue for sdma p2p case, as the sdma p2p -script presently does not deal with the transactions involving two devices -connected to the AIPS bus. - -Search the SDMA parent node first, which should be the AIPS bus, then -search the child node whose compatible string is spba-bus under that AIPS -bus for the above multi spba-busses case. - -Fixes: 8391ecf465ec ("dmaengine: imx-sdma: Add device to device support") -Signed-off-by: Shengjiu Wang -Reviewed-by: Frank Li -Link: https://patch.msgid.link/20260407032755.2758049-1-shengjiu.wang@nxp.com -Signed-off-by: Vinod Koul -Signed-off-by: Sasha Levin ---- - drivers/dma/imx-sdma.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c -index 292f4c9a963dd4..08d3c9d958369f 100644 ---- a/drivers/dma/imx-sdma.c -+++ b/drivers/dma/imx-sdma.c -@@ -2191,7 +2191,9 @@ static int sdma_probe(struct platform_device *pdev) - goto err_register; - } - -- spba_bus = of_find_compatible_node(NULL, NULL, "fsl,spba-bus"); -+ struct device_node *sdma_parent_np __free(device_node) = of_get_parent(np); -+ -+ spba_bus = of_get_compatible_child(sdma_parent_np, "fsl,spba-bus"); - ret = of_address_to_resource(spba_bus, 0, &spba_res); - if (!ret) { - sdma->spba_start_addr = spba_res.start; --- -2.53.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 35d6756b96..7e5e34635d 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -391,7 +391,6 @@ iio-magnetometer-ak8975-fix-potential-kernel-stack-m.patch iio-accel-mma8452-handle-i2c-read-error-s-in-mma8452.patch hid-logitech-hidpp-remove-excess-kernel-doc-member-i.patch drm-amd-display-add-missing-kdoc-for-allm-parameters.patch -dmaengine-imx-sdma-refine-spba-bus-searching-in-prob.patch perf-fix-off-by-one-stack-buffer-overflow-in-kallsym.patch perf-mmap-guard-cpu__get_node-return-in-aio_bind.patch perf-sched-clean-up-idle_threads-entry-on-init-failu.patch