From: Greg Kroah-Hartman Date: Tue, 12 Nov 2024 09:38:57 +0000 (+0100) Subject: 6.1-stable patches X-Git-Tag: v5.15.172~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea31bbd04c8bc4e87a9f2d2be6198054980d90f5;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..9d59b7ff0bc --- /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 +Date: Tue, 7 Nov 2023 08:15:21 +0100 +Subject: media: amphion: Fix VPU core alias name + +From: Alexander Stein + +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 +Reviewed-by: Ming Qian +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman +--- + 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 55cb4974c1c..b0b92a04bc1 100644 --- 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