diff options
| author | Bard Liao <yung-chuan.liao@linux.intel.com> | 2025-10-30 14:55:03 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-10-30 12:35:04 +0000 |
| commit | ef37146360385282b5f6a5b4bf695db30d609887 (patch) | |
| tree | b5025d434eff52f33163326ad8615a1079c16f29 /sound/soc/sof | |
| parent | f1dfbc1b5cf8650ae9a0d543e5f5335fc0f478ce (diff) | |
ASoC: SOF: Intel: remove hyphen from AMP<index> name_prexix
For those amp with "AMP" name_prefix in the codec_info_list[], use the
AMP<index> 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 <yung-chuan.liao@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://patch.msgid.link/20251030065503.1216419-1-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sof')
| -rw-r--r-- | sound/soc/sof/intel/hda.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 4a59dd53c569..c1518dbee1b7 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 + * <name_prefix>-<amp_index> format. Like rt1320-1 + */ adr_dev[index].name_prefix = devm_kasprintf(dev, GFP_KERNEL, "%s-%d", name_prefix, *amp_index); |