OSDN Git Service

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

index a79466c..940eb27 100644 (file)
@@ -1153,6 +1153,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
        const struct dmi_system_id *dmi_id;
        struct byt_rt5640_private *priv;
        struct snd_soc_acpi_mach *mach;
+       const char *platform_name;
        const char *i2c_name = NULL;
        int ret_val = 0;
        int dai_index = 0;
@@ -1317,6 +1318,14 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
                 map_name[BYT_RT5640_MAP(byt_rt5640_quirk)]);
        byt_rt5640_card.long_name = byt_rt5640_long_name;
 
+       /* override plaform name, if required */
+       platform_name = mach->mach_params.platform;
+
+       ret_val = snd_soc_fixup_dai_links_platform_name(&byt_rt5640_card,
+                                                       platform_name);
+       if (ret_val)
+               return ret_val;
+
        ret_val = devm_snd_soc_register_card(&pdev->dev, &byt_rt5640_card);
 
        if (ret_val) {