From: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Date: Mon, 29 Sep 2025 05:37:46 +0000 (+0300)
Subject: linux-firmware: backport the topology rename patch
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee1600aff7ed3c18f5cb512ca069ff564063744e;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

linux-firmware: backport the topology rename patch

Backport the patch from the trunk, renaming topology file for one of
Qualcomm boards in order to reduce possible compatibility issues.

Cc: Vivek Puar <vpuar@qti.qualcomm.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
---

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware/0001-qcom-move-LEMANS-EVK-firmware-to-correct-location.patch b/meta/recipes-kernel/linux-firmware/linux-firmware/0001-qcom-move-LEMANS-EVK-firmware-to-correct-location.patch
new file mode 100644
index 0000000000..01e555cbeb
--- /dev/null
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware/0001-qcom-move-LEMANS-EVK-firmware-to-correct-location.patch
@@ -0,0 +1,39 @@
+From 6625e563d600eba34cf2c71df7572ad1c421c6fd Mon Sep 17 00:00:00 2001
+From: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
+Date: Thu, 18 Sep 2025 05:37:13 +0300
+Subject: [PATCH] qcom: move LEMANS EVK firmware to correct location
+
+All firmware for the Lemans platform is located under qcom/sa8775p/
+subdir. Move audio topology for Lemans EVK to the same location and
+provide (ugh) backwards-compatible symlink.
+
+Cc: Mohammad Rafi Shaik <mohammad.rafi.shaik@oss.qualcomm.com>
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
+Upstream-Status: Backport [https://gitlab.com/kernel-firmware/linux-firmware/-/commit/6625e563d600eba34cf2c71df7572ad1c421c6fd]
+---
+ WHENCE                                        |   3 ++-
+ qcom/{qcs9100 => sa8775p}/LEMANS-EVK-tplg.bin | Bin
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ rename qcom/{qcs9100 => sa8775p}/LEMANS-EVK-tplg.bin (100%)
+
+diff --git a/WHENCE b/WHENCE
+index a93effa5008b..e22d8218959f 100644
+--- a/WHENCE
++++ b/WHENCE
+@@ -8469,7 +8469,8 @@ Originates from https://github.com/linux-msm/audioreach-topology.git
+ --------------------------------------------------------------------------
+ 
+ Driver: qcom-qcs9100 - Qualcomm ASoC topology
+-File: qcom/qcs9100/LEMANS-EVK-tplg.bin
++File: qcom/sa8775p/LEMANS-EVK-tplg.bin
++Link: qcom/qcs9100/LEMANS-EVK-tplg.bin -> ../sa8775p/LEMANS-EVK-tplg.bin
+ Version: v0.1.0
+ 
+ Licence: Redistributable. See LICENCE.linaro for details
+diff --git a/qcom/qcs9100/LEMANS-EVK-tplg.bin b/qcom/sa8775p/LEMANS-EVK-tplg.bin
+similarity index 100%
+rename from qcom/qcs9100/LEMANS-EVK-tplg.bin
+rename to qcom/sa8775p/LEMANS-EVK-tplg.bin
+-- 
+2.51.0
+
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20250917.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20250917.bb
index 5d5a5c8cae..9a80932754 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20250917.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20250917.bb
@@ -246,7 +246,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     "
 # WHENCE checksum is defined separately to ease overriding it if
 # class-devupstream is selected.
-WHENCE_CHKSUM  = "714332457b96406b3ccff321b60680b1"
+WHENCE_CHKSUM  = "a12ddaaab7162785af9d79b76132d185"
 
 # These are not common licenses, set NO_GENERIC_LICENSE for them
 # so that the license files will be copied from fetched source
@@ -372,6 +372,7 @@ PE = "1"
 
 SRC_URI = "\
   ${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz \
+  file://0001-qcom-move-LEMANS-EVK-firmware-to-correct-location.patch \
 "
 
 BBCLASSEXTEND = "devupstream:target"