Skip to content

Commit 5b417fe

Browse files
crojewsk-intelbroonie
authored andcommitted
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: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> Link: https://msgid.link/r/20240220115035.770402-11-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 36478a7 commit 5b417fe

1 file changed

Lines changed: 85 additions & 0 deletions

File tree

sound/soc/intel/avs/board_selection.c

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,82 @@ static struct snd_soc_acpi_mach avs_gml_i2s_machines[] = {
236236
{},
237237
};
238238

239+
static struct snd_soc_acpi_mach avs_cnl_i2s_machines[] = {
240+
{
241+
.id = "INT34C2",
242+
.drv_name = "avs_rt274",
243+
.mach_params = {
244+
.i2s_link_mask = AVS_SSP(0),
245+
},
246+
.tplg_filename = "rt274-tplg.bin",
247+
},
248+
{
249+
.id = "10EC5682",
250+
.drv_name = "avs_rt5682",
251+
.mach_params = {
252+
.i2s_link_mask = AVS_SSP(1),
253+
},
254+
.tplg_filename = "rt5682-tplg.bin",
255+
},
256+
{},
257+
};
258+
259+
static struct snd_soc_acpi_mach avs_icl_i2s_machines[] = {
260+
{
261+
.id = "INT343A",
262+
.drv_name = "avs_rt298",
263+
.mach_params = {
264+
.i2s_link_mask = AVS_SSP(0),
265+
},
266+
.tplg_filename = "rt298-tplg.bin",
267+
},
268+
{
269+
.id = "INT34C2",
270+
.drv_name = "avs_rt274",
271+
.mach_params = {
272+
.i2s_link_mask = AVS_SSP(0),
273+
},
274+
.tplg_filename = "rt274-tplg.bin",
275+
},
276+
{},
277+
};
278+
279+
static struct snd_soc_acpi_mach avs_tgl_i2s_machines[] = {
280+
{
281+
.id = "INT34C2",
282+
.drv_name = "avs_rt274",
283+
.mach_params = {
284+
.i2s_link_mask = AVS_SSP(0),
285+
},
286+
.tplg_filename = "rt274-tplg.bin",
287+
},
288+
{
289+
.id = "10EC0298",
290+
.drv_name = "avs_rt298",
291+
.mach_params = {
292+
.i2s_link_mask = AVS_SSP(0),
293+
},
294+
.tplg_filename = "rt298-tplg.bin",
295+
},
296+
{
297+
.id = "10EC1308",
298+
.drv_name = "avs_rt1308",
299+
.mach_params = {
300+
.i2s_link_mask = AVS_SSP(1),
301+
},
302+
.tplg_filename = "rt1308-tplg.bin",
303+
},
304+
{
305+
.id = "ESSX8336",
306+
.drv_name = "avs_es8336",
307+
.mach_params = {
308+
.i2s_link_mask = AVS_SSP(0),
309+
},
310+
.tplg_filename = "es8336-tplg.bin",
311+
},
312+
{},
313+
};
314+
239315
static struct snd_soc_acpi_mach avs_test_i2s_machines[] = {
240316
{
241317
.drv_name = "avs_i2s_test",
@@ -296,6 +372,15 @@ static const struct avs_acpi_boards i2s_boards[] = {
296372
AVS_MACH_ENTRY(HDA_KBL_LP, avs_kbl_i2s_machines),
297373
AVS_MACH_ENTRY(HDA_APL, avs_apl_i2s_machines),
298374
AVS_MACH_ENTRY(HDA_GML, avs_gml_i2s_machines),
375+
AVS_MACH_ENTRY(HDA_CNL_LP, avs_cnl_i2s_machines),
376+
AVS_MACH_ENTRY(HDA_CNL_H, avs_cnl_i2s_machines),
377+
AVS_MACH_ENTRY(HDA_CML_LP, avs_cnl_i2s_machines),
378+
AVS_MACH_ENTRY(HDA_ICL_LP, avs_icl_i2s_machines),
379+
AVS_MACH_ENTRY(HDA_TGL_LP, avs_tgl_i2s_machines),
380+
AVS_MACH_ENTRY(HDA_EHL_0, avs_tgl_i2s_machines),
381+
AVS_MACH_ENTRY(HDA_ADL_P, avs_tgl_i2s_machines),
382+
AVS_MACH_ENTRY(HDA_RPL_P_0, avs_tgl_i2s_machines),
383+
AVS_MACH_ENTRY(HDA_RPL_M, avs_tgl_i2s_machines),
299384
{},
300385
};
301386

0 commit comments

Comments
 (0)