6.1-stable patches

added patches:
	media-amphion-fix-vpu-core-alias-name.patch

diff --git a/queue-6.1/media-amphion-fix-vpu-core-alias-name.patch b/queue-6.1/media-amphion-fix-vpu-core-alias-name.patch
new file mode 100644 (file)
index 0000000..9d59b7f
--- /dev/null
+++ b/queue-6.1/media-amphion-fix-vpu-core-alias-name.patch
@@ -0,0 +1,36 @@
+From f033c87fda47e272bb4f75dc7b03677261d91158 Mon Sep 17 00:00:00 2001
+From: Alexander Stein <alexander.stein@ew.tq-group.com>
+Date: Tue, 7 Nov 2023 08:15:21 +0100
+Subject: media: amphion: Fix VPU core alias name
+
+From: Alexander Stein <alexander.stein@ew.tq-group.com>
+
+commit f033c87fda47e272bb4f75dc7b03677261d91158 upstream.
+
+Starting with commit f6038de293f2 ("arm64: dts: imx8qm: Fix VPU core
+alias name") the alias for VPU cores uses dashes instead of underscores.
+Adjust the alias stem accordingly. Fixes the errors:
+amphion-vpu-core 2d040000.vpu-core: can't get vpu core id
+amphion-vpu-core 2d050000.vpu-core: can't get vpu core id
+
+Fixes: f6038de293f2 ("arm64: dts: imx8qm: Fix VPU core alias name")
+Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
+Reviewed-by: Ming Qian <ming.qian@nxp.com>
+Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/media/platform/amphion/vpu_core.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/media/platform/amphion/vpu_core.c
++++ b/drivers/media/platform/amphion/vpu_core.c
+@@ -642,7 +642,7 @@ static int vpu_core_probe(struct platfor
+               return -ENODEV;
+ 
+       core->type = core->res->type;
+-      core->id = of_alias_get_id(dev->of_node, "vpu_core");
++      core->id = of_alias_get_id(dev->of_node, "vpu-core");
+       if (core->id < 0) {
+               dev_err(dev, "can't get vpu core id\n");
+               return core->id;

diff --git a/queue-6.1/series b/queue-6.1/series
index 55cb4974c1c4389b9df201f65ceafc14b923afe5..b0b92a04bc1325b77563b220f3b0d02e8ea8d583 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -95,3 +95,4 @@ asoc-amd-yc-fix-internal-mic-on-xiaomi-book-pro-14-2022.patch
 net-sched-use-rcu-read-side-critical-section-in-taprio_dump.patch
 hv_sock-initializing-vsk-trans-to-null-to-prevent-a-dangling-pointer.patch
 vsock-virtio-initialization-of-the-dangling-pointer-occurring-in-vsk-trans.patch
+media-amphion-fix-vpu-core-alias-name.patch