Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 5b14aa71 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: glk_rt5682_max98357a: platform name fixup support 



Add helper to override dailink platform name, if passed as parameter

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fbe2c273

sound/soc/intel/boards/glk_rt5682_max98357a.c

+17 −4
Original line number Diff line number Diff line
@@ -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"
@@ -571,6 +572,10 @@ 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)
@@ -578,11 +583,19 @@ static int geminilake_audio_probe(struct platform_device *pdev) 


	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[] = {