ASoC: Intel: haswell: platform name fixup support

Add helper to override dailink platform name, if passed as parameter

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/intel/boards/haswell.c b/sound/soc/intel/boards/haswell.c
index a4022983a7ce0050b3a5d857b0edd6ed691e0636..971226d420420b84248f74a69002d4a3989ff059 100644 (file)
--- a/sound/soc/intel/boards/haswell.c
+++ b/sound/soc/intel/boards/haswell.c
@@ -19,6 +19,7 @@
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
+#include <sound/soc-acpi.h>
 #include <sound/pcm_params.h>
 
 #include "../common/sst-dsp.h"
@@ -189,8 +190,22 @@ static struct snd_soc_card haswell_rt5640 = {
 
 static int haswell_audio_probe(struct platform_device *pdev)
 {
+       struct snd_soc_acpi_mach *mach;
+       const char *platform_name = NULL;
+       int ret;
+
        haswell_rt5640.dev = &pdev->dev;
 
+       /* override plaform name, if required */
+       mach = (&pdev->dev)->platform_data;
+       if (mach) /* extra check since legacy does not pass parameters */
+               platform_name = mach->mach_params.platform;
+
+       ret = snd_soc_fixup_dai_links_platform_name(&haswell_rt5640,
+                                                   platform_name);
+       if (ret)
+               return ret;
+
        return devm_snd_soc_register_card(&pdev->dev, &haswell_rt5640);
 }