Unverified Commit e194098b authored Mar 01, 2019 by Pierre-Louis Bossart Committed by Mark Brown Apr 02, 2019

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

Suggested-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent cce13969

sound/soc/soc-core.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -1974,10 +1974,13 @@ static void soc_check_tplg_fes(struct snd_soc_card *card)
		continue;

		/* for this machine ? */
		if (strcmp(component->driver->ignore_machine,
		if (!strcmp(component->driver->ignore_machine,
		card->dev->driver->name))
		goto match;
		if (strcmp(component->driver->ignore_machine,
		dev_name(card->dev)))
		continue;

		match:
		/* machine matches, so override the rtd data */
		for_each_card_prelinks(card, i, dai_link) {

Admin message