Skip to content

Commit 08f7ddb

Browse files
committed
ASoC: core: support driver alias names for FE topology overrides
When the same machine driver is reused between platforms but with a different alias, using the driver name is not enough. Add additional fallback case to use the card device name. Tested on GeminiLake with bxt_da7219_max98357a machine driver Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
1 parent b2bf3fb commit 08f7ddb

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

sound/soc/soc-core.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2106,10 +2106,13 @@ static void soc_check_tplg_fes(struct snd_soc_card *card)
21062106
continue;
21072107

21082108
/* for this machine ? */
2109+
if (!strcmp(platform->driver->ignore_machine,
2110+
card->dev->driver->name))
2111+
goto match;
21092112
if (strcmp(platform->driver->ignore_machine,
2110-
card->dev->driver->name))
2113+
dev_name(card->dev)))
21112114
continue;
2112-
2115+
match:
21132116
/* machine matches, so override the rtd data */
21142117
for (i = 0; i < card->num_links; i++) {
21152118

0 commit comments

Comments
 (0)