]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: Intel: bytcr_rt5651: platform name fixup support
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Fri, 25 Jan 2019 20:35:00 +0000 (14:35 -0600)
committerMark Brown <broonie@kernel.org>
Mon, 28 Jan 2019 18:08:14 +0000 (18:08 +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/bytcr_rt5651.c

index e6945d11c8abde6b47e61504185e83680919c412..c3b7732929cc768bed6ff7d8bd4940e1f94b222d 100644 (file)
@@ -922,6 +922,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
        static const char * const mic_name[] = { "dmic", "in1", "in2", "in12" };
        struct byt_rt5651_private *priv;
        struct snd_soc_acpi_mach *mach;
+       const char *platform_name;
        struct device *codec_dev;
        const char *i2c_name = NULL;
        const char *hp_swapped;
@@ -1137,6 +1138,14 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
                 mic_name[BYT_RT5651_MAP(byt_rt5651_quirk)], hp_swapped);
        byt_rt5651_card.long_name = byt_rt5651_long_name;
 
+       /* override plaform name, if required */
+       platform_name = mach->mach_params.platform;
+
+       ret_val = snd_soc_fixup_dai_links_platform_name(&byt_rt5651_card,
+                                                       platform_name);
+       if (ret_val)
+               return ret_val;
+
        ret_val = devm_snd_soc_register_card(&pdev->dev, &byt_rt5651_card);
 
        if (ret_val) {