Andrew Lukoshko
b3393f484c
Drop the 211.7.x security-ahead patches superseded by the RHEL 211.8.1..211.16.1 backports (1100-1104), add those backports (1106-1161) from centos-stream-10 and upstream linux-6.12.y. Keep the smb cifs.spnego ahead-fix (1105). Bump to 211.16.1.
79 lines
2.9 KiB
Diff
79 lines
2.9 KiB
Diff
From 97fd7dca352424825024946458c26d8729e2f72b Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <jkysela@redhat.com>
|
|
Date: Thu, 5 Mar 2026 15:05:45 +0100
|
|
Subject: [PATCH] ASoC: soc_sdw_utils: partial match the codec name
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
JIRA: https://issues.redhat.com/browse/RHEL-85741
|
|
|
|
commit c5ae3d8bc968a28aaeefbb772ec42e50cf3a15f0
|
|
Author: Bard Liao <yung-chuan.liao@linux.intel.com>
|
|
Date: Wed Feb 25 21:50:03 2026 +0800
|
|
|
|
ASoC: soc_sdw_utils: partial match the codec name
|
|
|
|
Currently, we can set codec name in the dai info which will be set as
|
|
the codec component name in a DAI link. However, the codec name may
|
|
not be fixed. For example, there is an index in a SDCA codec name and
|
|
that is not fixed. Lookup the fixed codec name string from the component
|
|
list to get the right component name to ensure the DAI link will bind
|
|
to the right codec component.
|
|
|
|
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
|
|
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
|
|
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
|
|
Link: https://patch.msgid.link/20260225135004.2322987-3-yung-chuan.liao@linux.intel.com
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
|
|
Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
|
|
|
|
diff --git a/sound/soc/sdw_utils/soc_sdw_utils.c b/sound/soc/sdw_utils/soc_sdw_utils.c
|
|
index 2f3c9698a0e8..88afb14e1ed3 100644
|
|
--- a/sound/soc/sdw_utils/soc_sdw_utils.c
|
|
+++ b/sound/soc/sdw_utils/soc_sdw_utils.c
|
|
@@ -1213,8 +1213,18 @@ const char *asoc_sdw_get_codec_name(struct device *dev,
|
|
const struct snd_soc_acpi_link_adr *adr_link,
|
|
int adr_index)
|
|
{
|
|
- if (dai_info->codec_name)
|
|
- return devm_kstrdup(dev, dai_info->codec_name, GFP_KERNEL);
|
|
+ if (dai_info->codec_name) {
|
|
+ struct snd_soc_component *component;
|
|
+
|
|
+ component = snd_soc_lookup_component_by_name(dai_info->codec_name);
|
|
+ if (component) {
|
|
+ dev_dbg(dev, "%s found component %s for codec_name %s\n",
|
|
+ __func__, component->name, dai_info->codec_name);
|
|
+ return devm_kstrdup(dev, component->name, GFP_KERNEL);
|
|
+ } else {
|
|
+ return devm_kstrdup(dev, dai_info->codec_name, GFP_KERNEL);
|
|
+ }
|
|
+ }
|
|
|
|
return _asoc_sdw_get_codec_name(dev, adr_link, adr_index);
|
|
}
|
|
@@ -1526,7 +1536,17 @@ int asoc_sdw_parse_sdw_endpoints(struct snd_soc_card *card,
|
|
return -EINVAL;
|
|
|
|
for (j = 0; j < codec_info->aux_num; j++) {
|
|
- soc_aux->dlc.name = codec_info->auxs[j].codec_name;
|
|
+ struct snd_soc_component *component;
|
|
+
|
|
+ component = snd_soc_lookup_component_by_name(codec_info->auxs[j].codec_name);
|
|
+ if (component) {
|
|
+ dev_dbg(dev, "%s found component %s for aux name %s\n",
|
|
+ __func__, component->name,
|
|
+ codec_info->auxs[j].codec_name);
|
|
+ soc_aux->dlc.name = component->name;
|
|
+ } else {
|
|
+ soc_aux->dlc.name = codec_info->auxs[j].codec_name;
|
|
+ }
|
|
soc_aux++;
|
|
}
|
|
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|