Unverified Commit e9023248 authored by Lucas Tanure's avatar Lucas Tanure Committed by Mark Brown
Browse files

ASoC: amd: vangogh: Add components prefix in structs and function names 



Add prefixes 8821/35l41 in structs and function names so future platforms
can be added and reference the correct sound card.
Also include acp5x prefix to cs35l41_conf.

Signed-off-by: default avatarLucas Tanure <lucas.tanure@collabora.com>
Link: https://lore.kernel.org/r/20230217110850.1045250-10-lucas.tanure@collabora.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c10955e4

sound/soc/amd/vangogh/acp5x-mach.c

+14 −14
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static const struct snd_soc_ops acp5x_cs35l41_play_ops = { 
	.hw_params = acp5x_cs35l41_hw_params,

};



static struct snd_soc_codec_conf cs35l41_conf[] = {

static struct snd_soc_codec_conf acp5x_cs35l41_conf[] = {

	{

		.dlc = COMP_CODEC_CONF(ACP5X_CS35L41_COMP_LNAME),

		.name_prefix = "Left",
@@ -266,7 +266,7 @@ SND_SOC_DAILINK_DEF(cs35l41, DAILINK_COMP_ARRAY(COMP_CODEC(ACP5X_CS35L41_COMP_LN 
						COMP_CODEC(ACP5X_CS35L41_COMP_RNAME,

							   ACP5X_CS35L41_DAI_NAME)));



static struct snd_soc_dai_link acp5x_dai[] = {

static struct snd_soc_dai_link acp5x_8821_35l41_dai[] = {

	{

		.name = "acp5x-8821-play",

		.stream_name = "Playback/Capture",
@@ -294,7 +294,7 @@ static struct snd_soc_dai_link acp5x_dai[] = { 






static const struct snd_soc_dapm_widget acp5x_8821_widgets[] = {

static const struct snd_soc_dapm_widget acp5x_8821_35l41_widgets[] = {

	SND_SOC_DAPM_HP("Headphone", NULL),

	SND_SOC_DAPM_MIC("Headset Mic", NULL),

	SND_SOC_DAPM_MIC("Int Mic", NULL),
@@ -303,7 +303,7 @@ static const struct snd_soc_dapm_widget acp5x_8821_widgets[] = { 
			    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

};



static const struct snd_soc_dapm_route acp5x_8821_audio_route[] = {

static const struct snd_soc_dapm_route acp5x_8821_35l41_audio_route[] = {

	/* HP jack connectors - unknown if we have jack detection */

	{ "Headphone", NULL, "HPOL" },

	{ "Headphone", NULL, "HPOR" },
@@ -316,17 +316,17 @@ static const struct snd_soc_dapm_route acp5x_8821_audio_route[] = { 
	{ "Int Mic", NULL, "Platform Clock" },

};



static struct snd_soc_card acp5x_card = {

static struct snd_soc_card acp5x_8821_35l41_card = {

	.name = "acp5x",

	.owner = THIS_MODULE,

	.dai_link = acp5x_dai,

	.num_links = ARRAY_SIZE(acp5x_dai),

	.dapm_widgets = acp5x_8821_widgets,

	.num_dapm_widgets = ARRAY_SIZE(acp5x_8821_widgets),

	.dapm_routes = acp5x_8821_audio_route,

	.num_dapm_routes = ARRAY_SIZE(acp5x_8821_audio_route),

	.codec_conf = cs35l41_conf,

	.num_configs = ARRAY_SIZE(cs35l41_conf),

	.dai_link = acp5x_8821_35l41_dai,

	.num_links = ARRAY_SIZE(acp5x_8821_35l41_dai),

	.dapm_widgets = acp5x_8821_35l41_widgets,

	.num_dapm_widgets = ARRAY_SIZE(acp5x_8821_35l41_widgets),

	.dapm_routes = acp5x_8821_35l41_audio_route,

	.num_dapm_routes = ARRAY_SIZE(acp5x_8821_35l41_audio_route),

	.codec_conf = acp5x_cs35l41_conf,

	.num_configs = ARRAY_SIZE(acp5x_cs35l41_conf),

	.controls = acp5x_8821_controls,

	.num_controls = ARRAY_SIZE(acp5x_8821_controls),

};
@@ -363,7 +363,7 @@ static int acp5x_probe(struct platform_device *pdev) 
	dmi_check_system(acp5x_vg_quirk_table);

	switch (acp5x_machine_id) {

	case VG_JUPITER:

		card = &acp5x_card;

		card = &acp5x_8821_35l41_card;

		break;

	default:

		return -ENODEV;