Unverified Commit 61cafaea authored by Brent Lu's avatar Brent Lu Committed by Mark Brown
Browse files

ASoC: Intel: sof_rt5682: board id cleanup for cml boards 



Introduce "cml_rt5682_def" for cml boards which implement headphone
codec on SSP0 and speaker amplifiers on SSP1.

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/20240325221059.206042-22-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/sof_rt5682.c

+1 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ static const struct platform_device_id board_ids[] = { 
		.name = "sof_rt5682",

	},

	{

		.name = "cml_rt1015_rt5682",

		.name = "cml_rt5682_def",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_SSP_PORT_CODEC(0) |

					SOF_SSP_PORT_AMP(1)),

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

+3 −3
Original line number Diff line number Diff line
@@ -49,21 +49,21 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = { 
	},

	{

		.id = "10EC5682",

		.drv_name = "cml_rt1015_rt5682",

		.drv_name = "cml_rt5682_def",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &rt1015_spk_codecs,

		.sof_tplg_filename = "sof-cml-rt1011-rt5682.tplg",

	},

	{

		.id = "10EC5682",

		.drv_name = "sof_rt5682",

		.drv_name = "cml_rt5682_def",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &max98357a_spk_codecs,

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

	},

	{

		.id = "10EC5682",

		.drv_name = "sof_rt5682",

		.drv_name = "cml_rt5682_def",

		.sof_tplg_filename = "sof-cml-rt5682.tplg",

	},

	{