Skip to content

Commit

Permalink
ASoC: Intel: glk_rt5682_max98357a: platform name fixup support
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pierre-Louis Bossart authored and Mark Brown committed Jan 28, 2019
1 parent fbe2c27 commit 5b14aa7
Showing 1 changed file with 17 additions and 4 deletions.
21 changes: 17 additions & 4 deletions sound/soc/intel/boards/glk_rt5682_max98357a.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
#include <sound/soc-acpi.h>
#include "../skylake/skl.h"
#include "../../codecs/rt5682.h"
#include "../../codecs/hdac_hdmi.h"
Expand Down Expand Up @@ -571,18 +572,30 @@ static struct snd_soc_card glk_audio_card_rt5682_m98357a = {
static int geminilake_audio_probe(struct platform_device *pdev)
{
struct glk_card_private *ctx;
struct snd_soc_acpi_mach *mach;
const char *platform_name;
struct snd_soc_card *card;
int ret;

ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
if (!ctx)
return -ENOMEM;

INIT_LIST_HEAD(&ctx->hdmi_pcm_list);

glk_audio_card_rt5682_m98357a.dev = &pdev->dev;
snd_soc_card_set_drvdata(&glk_audio_card_rt5682_m98357a, ctx);
card = &glk_audio_card_rt5682_m98357a;
card->dev = &pdev->dev;
snd_soc_card_set_drvdata(card, ctx);

/* override plaform name, if required */
mach = (&pdev->dev)->platform_data;
platform_name = mach->mach_params.platform;

ret = snd_soc_fixup_dai_links_platform_name(card, platform_name);
if (ret)
return ret;

return devm_snd_soc_register_card(&pdev->dev,
&glk_audio_card_rt5682_m98357a);
return devm_snd_soc_register_card(&pdev->dev, card);
}

static const struct platform_device_id glk_board_ids[] = {
Expand Down

0 comments on commit 5b14aa7

Please sign in to comment.