Unverified Commit 5b417fe0 authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: avs: Populate board selection with new I2S entries 



Update board selection with tables specifying supported I2S
configurations. DMIC/HDAudio board selection require no update as
dmic/hdaudio machine boards are generic and not tied to any specific
codec.

Reviewed-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://msgid.link/r/20240220115035.770402-11-cezary.rojewski@intel.com


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

sound/soc/intel/avs/board_selection.c

+85 −0
Original line number Diff line number Diff line
@@ -236,6 +236,82 @@ static struct snd_soc_acpi_mach avs_gml_i2s_machines[] = { 
	{},

};



static struct snd_soc_acpi_mach avs_cnl_i2s_machines[] = {

	{

		.id = "INT34C2",

		.drv_name = "avs_rt274",

		.mach_params = {

			.i2s_link_mask = AVS_SSP(0),

		},

		.tplg_filename = "rt274-tplg.bin",

	},

	{

		.id = "10EC5682",

		.drv_name = "avs_rt5682",

		.mach_params = {

			.i2s_link_mask = AVS_SSP(1),

		},

		.tplg_filename = "rt5682-tplg.bin",

	},

	{},

};



static struct snd_soc_acpi_mach avs_icl_i2s_machines[] = {

	{

		.id = "INT343A",

		.drv_name = "avs_rt298",

		.mach_params = {

			.i2s_link_mask = AVS_SSP(0),

		},

		.tplg_filename = "rt298-tplg.bin",

	},

	{

		.id = "INT34C2",

		.drv_name = "avs_rt274",

		.mach_params = {

			.i2s_link_mask = AVS_SSP(0),

		},

		.tplg_filename = "rt274-tplg.bin",

	},

	{},

};



static struct snd_soc_acpi_mach avs_tgl_i2s_machines[] = {

	{

		.id = "INT34C2",

		.drv_name = "avs_rt274",

		.mach_params = {

			.i2s_link_mask = AVS_SSP(0),

		},

		.tplg_filename = "rt274-tplg.bin",

	},

	{

		.id = "10EC0298",

		.drv_name = "avs_rt298",

		.mach_params = {

			.i2s_link_mask = AVS_SSP(0),

		},

		.tplg_filename = "rt298-tplg.bin",

	},

	{

		.id = "10EC1308",

		.drv_name = "avs_rt1308",

		.mach_params = {

			.i2s_link_mask = AVS_SSP(1),

		},

		.tplg_filename = "rt1308-tplg.bin",

	},

	{

		.id = "ESSX8336",

		.drv_name = "avs_es8336",

		.mach_params = {

			.i2s_link_mask = AVS_SSP(0),

		},

		.tplg_filename = "es8336-tplg.bin",

	},

	{},

};



static struct snd_soc_acpi_mach avs_test_i2s_machines[] = {

	{

		.drv_name = "avs_i2s_test",
@@ -296,6 +372,15 @@ static const struct avs_acpi_boards i2s_boards[] = { 
	AVS_MACH_ENTRY(HDA_KBL_LP, avs_kbl_i2s_machines),

	AVS_MACH_ENTRY(HDA_APL, avs_apl_i2s_machines),

	AVS_MACH_ENTRY(HDA_GML, avs_gml_i2s_machines),

	AVS_MACH_ENTRY(HDA_CNL_LP,	avs_cnl_i2s_machines),

	AVS_MACH_ENTRY(HDA_CNL_H,	avs_cnl_i2s_machines),

	AVS_MACH_ENTRY(HDA_CML_LP,	avs_cnl_i2s_machines),

	AVS_MACH_ENTRY(HDA_ICL_LP,	avs_icl_i2s_machines),

	AVS_MACH_ENTRY(HDA_TGL_LP,	avs_tgl_i2s_machines),

	AVS_MACH_ENTRY(HDA_EHL_0,	avs_tgl_i2s_machines),

	AVS_MACH_ENTRY(HDA_ADL_P,	avs_tgl_i2s_machines),

	AVS_MACH_ENTRY(HDA_RPL_P_0,	avs_tgl_i2s_machines),

	AVS_MACH_ENTRY(HDA_RPL_M,	avs_tgl_i2s_machines),

	{},

};