From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Sat, 2 Mar 2019 01:08:51 +0000 (-0600)
Subject: ASoC: core: support driver alias names for FE topology overrides
X-Git-Tag: v5.2-rc1~16^2~9^2~217
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e194098bf9098083f8ae9687924a6878540f8561;p=uclinux-h8%2Flinux.git

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>
---

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index d88757659729..6f4842977b8d 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -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,
+			    card->dev->driver->name))
+			goto match;
 		if (strcmp(component->driver->ignore_machine,
-			   card->dev->driver->name))
+			   dev_name(card->dev)))
 			continue;
-
+match:
 		/* machine matches, so override the rtd data */
 		for_each_card_prelinks(card, i, dai_link) {