OSDN Git Service

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

index 99f2a01..b86c746 100644 (file)
@@ -21,6 +21,7 @@
 #include <sound/soc.h>
 #include <sound/jack.h>
 #include <sound/pcm_params.h>
+#include <sound/soc-acpi.h>
 
 #include "../common/sst-dsp.h"
 #include "../haswell/sst-haswell-ipc.h"
@@ -267,7 +268,22 @@ static struct snd_soc_card broadwell_rt286 = {
 
 static int broadwell_audio_probe(struct platform_device *pdev)
 {
+       struct snd_soc_acpi_mach *mach;
+       const char *platform_name = NULL;
+       int ret;
+
        broadwell_rt286.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(&broadwell_rt286,
+                                                   platform_name);
+       if (ret)
+               return ret;
+
        return devm_snd_soc_register_card(&pdev->dev, &broadwell_rt286);
 }