Skip to content

Commit 5159057

Browse files
Brady Noranderbroonie
authored andcommitted
ASoC: amd: use new ACP dev names for DAI links
On AMD SoC platforms with an ACP2x gpu ip block (such as stoneyridge), the amdgpu driver will create several platform devices for the ACP ASoC driver to communicate with the ACP hardware block on the gpu. These platform devices include dma for audio and one or multiple i2s interfaces. The amdgpu driver has always created these platform devices with automatic ids. The ASoC machine drives hardcode the platform device name. This creates an issue where if the ACP platform devices are not the first to be created, the ids can be different to what the machine drivers expect, causing them to not find the ACP platform devices and failing to load. Switch to using static ids for these ACP platform devices so that the names never change. Depends on patch: drm/amdgpu: use static ids for ACP platform devs [1] [1] https://lore.kernel.org/all/20250325210517.2097188-1-bradynorander@gmail.com/ Signed-off-by: Brady Norander <bradynorander@gmail.com> Link: https://patch.msgid.link/20250330130844.37870-2-bradynorander@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 0e4e9d7 commit 5159057

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

sound/soc/amd/acp-da7219-max98357a.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -517,11 +517,11 @@ static const struct snd_soc_ops cz_rt5682_dmic1_cap_ops = {
517517
};
518518

519519
SND_SOC_DAILINK_DEF(designware1,
520-
DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.1.auto")));
520+
DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.1")));
521521
SND_SOC_DAILINK_DEF(designware2,
522-
DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.2.auto")));
522+
DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.2")));
523523
SND_SOC_DAILINK_DEF(designware3,
524-
DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.3.auto")));
524+
DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.3")));
525525

526526
SND_SOC_DAILINK_DEF(dlgs,
527527
DAILINK_COMP_ARRAY(COMP_CODEC("i2c-DLGS7219:00", "da7219-hifi")));
@@ -533,7 +533,7 @@ SND_SOC_DAILINK_DEF(adau,
533533
DAILINK_COMP_ARRAY(COMP_CODEC("ADAU7002:00", "adau7002-hifi")));
534534

535535
SND_SOC_DAILINK_DEF(platform,
536-
DAILINK_COMP_ARRAY(COMP_PLATFORM("acp_audio_dma.0.auto")));
536+
DAILINK_COMP_ARRAY(COMP_PLATFORM("acp_audio_dma.0")));
537537

538538
static struct snd_soc_dai_link cz_dai_7219_98357[] = {
539539
{

sound/soc/amd/acp-es8336.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ static const struct snd_soc_ops st_es8336_ops = {
137137
};
138138

139139
SND_SOC_DAILINK_DEF(designware1,
140-
DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.2.auto")));
140+
DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.1")));
141141
SND_SOC_DAILINK_DEF(codec,
142142
DAILINK_COMP_ARRAY(COMP_CODEC("i2c-ESSX8336:00", "ES8316 HiFi")));
143143
SND_SOC_DAILINK_DEF(platform,
144-
DAILINK_COMP_ARRAY(COMP_PLATFORM("acp_audio_dma.1.auto")));
144+
DAILINK_COMP_ARRAY(COMP_PLATFORM("acp_audio_dma.0")));
145145

146146
static struct snd_soc_dai_link st_dai_es8336[] = {
147147
{

sound/soc/amd/acp-rt5645.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,15 @@ static const struct snd_soc_ops cz_aif1_ops = {
108108
};
109109

110110
SND_SOC_DAILINK_DEF(designware1,
111-
DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.1.auto")));
111+
DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.1")));
112112
SND_SOC_DAILINK_DEF(designware2,
113-
DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.2.auto")));
113+
DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.2")));
114114

115115
SND_SOC_DAILINK_DEF(codec,
116116
DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC5650:00", "rt5645-aif1")));
117117

118118
SND_SOC_DAILINK_DEF(platform,
119-
DAILINK_COMP_ARRAY(COMP_PLATFORM("acp_audio_dma.0.auto")));
119+
DAILINK_COMP_ARRAY(COMP_PLATFORM("acp_audio_dma.0")));
120120

121121
static struct snd_soc_dai_link cz_dai_rt5650[] = {
122122
{

0 commit comments

Comments
 (0)