ASoC: Intel: bdw-rt5677: platform name fixup support
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Fri, 25 Jan 2019 20:34:58 +0000 (14:34 -0600)
committerMark Brown <broonie@kernel.org>
Mon, 28 Jan 2019 18:07:55 +0000 (18:07 +0000)
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>
sound/soc/intel/boards/bdw-rt5677.c

index efcfd906c8562b6dc13086ce18fc0e7f008705df..1844c88ea4e2a0ed27259eec600ef886979e43f6 100644 (file)
@@ -26,6 +26,7 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 #include <sound/jack.h>
+#include <sound/soc-acpi.h>
 
 #include "../common/sst-dsp.h"
 #include "../haswell/sst-haswell-ipc.h"
@@ -339,6 +340,9 @@ static struct snd_soc_card bdw_rt5677_card = {
 static int bdw_rt5677_probe(struct platform_device *pdev)
 {
        struct bdw_rt5677_priv *bdw_rt5677;
+       struct snd_soc_acpi_mach *mach;
+       const char *platform_name = NULL;
+       int ret;
 
        bdw_rt5677_card.dev = &pdev->dev;
 
@@ -350,6 +354,16 @@ static int bdw_rt5677_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
+       /* 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(&bdw_rt5677_card,
+                                                   platform_name);
+       if (ret)
+               return ret;
+
        snd_soc_card_set_drvdata(&bdw_rt5677_card, bdw_rt5677);
 
        return devm_snd_soc_register_card(&pdev->dev, &bdw_rt5677_card);