Unverified Commit 7b24d86c authored by Brent Lu's avatar Brent Lu Committed by Mark Brown
Browse files

ASoC: Intel: sof_rt5682: mach cleanup for rpl boards 



Add two common entries in enumeration table for all rt5682/rt5650
boards with/without speaker amplifier. All other rpl_rt5682_def
entries become redundant so get removed.

Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarBrent Lu <brent.lu@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240327162408.63953-14-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/common/soc-acpi-intel-rpl-match.c

+15 −25
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static const struct snd_soc_acpi_link_adr rplp_crb[] = { 


static const struct snd_soc_acpi_codecs rpl_rt5682_hp = {

	.num_codecs = 2,

	.codecs = {"10EC5682", "RTL5682"},

	.codecs = {RT5682_ACPI_HID, RT5682S_ACPI_HID},

};



static const struct snd_soc_acpi_codecs rpl_essx_83x6 = {
@@ -371,11 +371,6 @@ static const struct snd_soc_acpi_codecs rpl_lt6911_hdmi = { 
	.codecs = {"INTC10B0"}

};



static const struct snd_soc_acpi_codecs rpl_rt1019p_amp = {

	.num_codecs = 1,

	.codecs = {"RTL1019"}

};



struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {

	{

		.comp_ids = &rpl_rt5682_hp,
@@ -384,20 +379,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = { 
		.quirk_data = &rpl_max98357a_amp,

		.sof_tplg_filename = "sof-rpl-max98357a-rt5682.tplg",

	},

	{

		.comp_ids = &rpl_rt5682_hp,

		.drv_name = "rpl_rt5682_def",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &rpl_max98360a_amp,

		.sof_tplg_filename = "sof-rpl-max98360a-rt5682.tplg",

	},

	{

		.comp_ids = &rpl_rt5682_hp,

		.drv_name = "rpl_rt5682_def",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &rpl_rt1019p_amp,

		.sof_tplg_filename = "sof-rpl-rt1019-rt5682.tplg",

	},

	{

		.comp_ids = &rpl_rt5682_hp,

		.drv_name = "rpl_rt5682_c1_h02",
@@ -430,6 +411,20 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = { 
		.tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_AMP_NAME |

					SND_SOC_ACPI_TPLG_INTEL_CODEC_NAME,

	},

	{

		.id = RT5650_ACPI_HID,

		.drv_name = "rpl_rt5682_def",

		.sof_tplg_filename = "sof-rpl", /* the tplg suffix is added at run time */

		.tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_AMP_NAME |

					SND_SOC_ACPI_TPLG_INTEL_CODEC_NAME,

	},

	{

		.comp_ids = &rpl_rt5682_hp,

		.drv_name = "rpl_rt5682_def",

		.sof_tplg_filename = "sof-rpl", /* the tplg suffix is added at run time */

		.tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_AMP_NAME |

					SND_SOC_ACPI_TPLG_INTEL_CODEC_NAME,

	},

	/* place amp-only boards in the end of table */

	{

		.id = "INTC10B0",
@@ -443,11 +438,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = { 
		.quirk_data = &rpl_max98360a_amp,

		.sof_tplg_filename = "sof-rpl-max98360a-da7219.tplg",

	},

	{

		.id = "10EC5650",

		.drv_name = "rpl_rt5682_def",

		.sof_tplg_filename = "sof-rpl-rt5650.tplg",

	},

	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_rpl_machines);