Skip to content

Commit 02e6f7c

Browse files
plbossartbroonie
authored andcommitted
ASoC: Intel: soc-acpi: mtl: add Dell SKU 0C64 and 0CC6
SKU 0C64 relies on rt713 (jack codec) on link0, rt1318 (single amplifier) on link1 and rt1713 (dmic) on link3. SKU 0CC6 relies on rt713 (jack codec) on link0, rt1318 (two amplifiers) on link 1-2 and rt1713 (dmic) on link3. Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20240426152123.36284-4-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 69d0f88 commit 02e6f7c

1 file changed

Lines changed: 64 additions & 0 deletions

File tree

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,15 @@ static const struct snd_soc_acpi_adr_device rt1316_3_single_adr[] = {
312312
}
313313
};
314314

315+
static const struct snd_soc_acpi_adr_device rt1318_1_single_adr[] = {
316+
{
317+
.adr = 0x000130025D131801,
318+
.num_endpoints = 1,
319+
.endpoints = &single_endpoint,
320+
.name_prefix = "rt1318"
321+
}
322+
};
323+
315324
static const struct snd_soc_acpi_adr_device rt1318_1_group1_adr[] = {
316325
{
317326
.adr = 0x000130025D131801ull,
@@ -559,6 +568,49 @@ static const struct snd_soc_acpi_link_adr mtl_rt713_l0_rt1316_l12_rt1713_l3[] =
559568
{}
560569
};
561570

571+
static const struct snd_soc_acpi_link_adr mtl_rt713_l0_rt1318_l1_rt1713_l3[] = {
572+
{
573+
.mask = BIT(0),
574+
.num_adr = ARRAY_SIZE(rt713_0_single_adr),
575+
.adr_d = rt713_0_single_adr,
576+
},
577+
{
578+
.mask = BIT(1),
579+
.num_adr = ARRAY_SIZE(rt1318_1_single_adr),
580+
.adr_d = rt1318_1_single_adr,
581+
},
582+
{
583+
.mask = BIT(3),
584+
.num_adr = ARRAY_SIZE(rt1713_3_single_adr),
585+
.adr_d = rt1713_3_single_adr,
586+
},
587+
{}
588+
};
589+
590+
static const struct snd_soc_acpi_link_adr mtl_rt713_l0_rt1318_l12_rt1713_l3[] = {
591+
{
592+
.mask = BIT(0),
593+
.num_adr = ARRAY_SIZE(rt713_0_single_adr),
594+
.adr_d = rt713_0_single_adr,
595+
},
596+
{
597+
.mask = BIT(1),
598+
.num_adr = ARRAY_SIZE(rt1318_1_group1_adr),
599+
.adr_d = rt1318_1_group1_adr,
600+
},
601+
{
602+
.mask = BIT(2),
603+
.num_adr = ARRAY_SIZE(rt1318_2_group1_adr),
604+
.adr_d = rt1318_2_group1_adr,
605+
},
606+
{
607+
.mask = BIT(3),
608+
.num_adr = ARRAY_SIZE(rt1713_3_single_adr),
609+
.adr_d = rt1713_3_single_adr,
610+
},
611+
{}
612+
};
613+
562614
static const struct snd_soc_acpi_link_adr mtl_rt713_l0_rt1316_l12[] = {
563615
{
564616
.mask = BIT(0),
@@ -697,6 +749,18 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
697749
.drv_name = "sof_sdw",
698750
.sof_tplg_filename = "sof-mtl-rt713-l0-rt1316-l12-rt1713-l3.tplg",
699751
},
752+
{
753+
.link_mask = GENMASK(3, 0),
754+
.links = mtl_rt713_l0_rt1318_l12_rt1713_l3,
755+
.drv_name = "sof_sdw",
756+
.sof_tplg_filename = "sof-mtl-rt713-l0-rt1318-l12-rt1713-l3.tplg",
757+
},
758+
{
759+
.link_mask = BIT(0) | BIT(1) | BIT(3),
760+
.links = mtl_rt713_l0_rt1318_l1_rt1713_l3,
761+
.drv_name = "sof_sdw",
762+
.sof_tplg_filename = "sof-mtl-rt713-l0-rt1318-l1-rt1713-l3.tplg",
763+
},
700764
{
701765
.link_mask = GENMASK(2, 0),
702766
.links = mtl_rt713_l0_rt1316_l12,

0 commit comments

Comments
 (0)