From ef37146360385282b5f6a5b4bf695db30d609887 Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Thu, 30 Oct 2025 14:55:03 +0800 Subject: [PATCH] ASoC: SOF: Intel: remove hyphen from AMP name_prexix MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit For those amp with "AMP" name_prefix in the codec_info_list[], use the AMP format to meet the UCM expectation. Fixes: 5cd5f8fc29fa ("ASoC: SOF: Intel: add hyphen between name and index to amp name_prefix") Signed-off-by: Bard Liao Reviewed-by: Ranjani Sridharan Reviewed-by: Péter Ujfalusi Link: https://patch.msgid.link/20251030065503.1216419-1-yung-chuan.liao@linux.intel.com Signed-off-by: Mark Brown --- sound/soc/sof/intel/hda.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 4a59dd53c5696..c1518dbee1b7a 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -1260,7 +1260,15 @@ static struct snd_soc_acpi_adr_device *find_acpi_adr_device(struct device *dev, "AMP", *amp_index); break; } + } else if (!strcmp(name_prefix, "AMP")) { + adr_dev[index].name_prefix = devm_kasprintf(dev, GFP_KERNEL, "%s%d", + name_prefix, + *amp_index); } else { + /* + * The name_prefix will be the amp name if it is not "Left" or "AMP", set it to + * - format. Like rt1320-1 + */ adr_dev[index].name_prefix = devm_kasprintf(dev, GFP_KERNEL, "%s-%d", name_prefix, *amp_index); -- 2.47.3