Skip to content

Commit 124d534

Browse files
bardliaobroonie
authored andcommitted
ASoC: Intel: soc-acpi-intel-lnl-match: add rt713_vb_l2_rt1320_l13 support
Add rt713_vb on SoundWire link 2 and rt1320 on SoundWire link 1 and 3 configuration support. Signed-off-by: Bard Liao <[email protected]> Reviewed-by: Liam Girdwood <[email protected]> Reviewed-by: Kai Vehmanen <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent bd40d91 commit 124d534

File tree

1 file changed

+70
-0
lines changed

1 file changed

+70
-0
lines changed

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

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,23 @@ static const struct snd_soc_acpi_endpoint rt722_endpoints[] = {
9191
},
9292
};
9393

94+
static const struct snd_soc_acpi_endpoint jack_dmic_endpoints[] = {
95+
/* Jack Endpoint */
96+
{
97+
.num = 0,
98+
.aggregated = 0,
99+
.group_position = 0,
100+
.group_id = 0,
101+
},
102+
/* DMIC Endpoint */
103+
{
104+
.num = 1,
105+
.aggregated = 0,
106+
.group_position = 0,
107+
.group_id = 0,
108+
},
109+
};
110+
94111
static const struct snd_soc_acpi_endpoint jack_amp_g1_dmic_endpoints_endpoints[] = {
95112
/* Jack Endpoint */
96113
{
@@ -295,6 +312,24 @@ static const struct snd_soc_acpi_adr_device rt1320_1_group1_adr[] = {
295312
}
296313
};
297314

315+
static const struct snd_soc_acpi_adr_device rt1320_1_group2_adr[] = {
316+
{
317+
.adr = 0x000130025D132001ull,
318+
.num_endpoints = 1,
319+
.endpoints = &spk_l_endpoint,
320+
.name_prefix = "rt1320-1"
321+
}
322+
};
323+
324+
static const struct snd_soc_acpi_adr_device rt1320_3_group2_adr[] = {
325+
{
326+
.adr = 0x000330025D132001ull,
327+
.num_endpoints = 1,
328+
.endpoints = &spk_r_endpoint,
329+
.name_prefix = "rt1320-2"
330+
}
331+
};
332+
298333
static const struct snd_soc_acpi_adr_device rt713_0_adr[] = {
299334
{
300335
.adr = 0x000031025D071301ull,
@@ -304,6 +339,15 @@ static const struct snd_soc_acpi_adr_device rt713_0_adr[] = {
304339
}
305340
};
306341

342+
static const struct snd_soc_acpi_adr_device rt713_vb_2_adr[] = {
343+
{
344+
.adr = 0x000230025d071301ull,
345+
.num_endpoints = ARRAY_SIZE(jack_dmic_endpoints),
346+
.endpoints = jack_dmic_endpoints,
347+
.name_prefix = "rt713"
348+
}
349+
};
350+
307351
static const struct snd_soc_acpi_adr_device rt714_0_adr[] = {
308352
{
309353
.adr = 0x000030025D071401ull,
@@ -453,6 +497,25 @@ static const struct snd_soc_acpi_link_adr lnl_sdw_rt713_l0_rt1318_l1[] = {
453497
{}
454498
};
455499

500+
static const struct snd_soc_acpi_link_adr lnl_sdw_rt713_vb_l2_rt1320_l13[] = {
501+
{
502+
.mask = BIT(2),
503+
.num_adr = ARRAY_SIZE(rt713_vb_2_adr),
504+
.adr_d = rt713_vb_2_adr,
505+
},
506+
{
507+
.mask = BIT(1),
508+
.num_adr = ARRAY_SIZE(rt1320_1_group2_adr),
509+
.adr_d = rt1320_1_group2_adr,
510+
},
511+
{
512+
.mask = BIT(3),
513+
.num_adr = ARRAY_SIZE(rt1320_3_group2_adr),
514+
.adr_d = rt1320_3_group2_adr,
515+
},
516+
{}
517+
};
518+
456519
static const struct snd_soc_acpi_link_adr lnl_sdw_rt712_vb_l2_rt1320_l1[] = {
457520
{
458521
.mask = BIT(2),
@@ -550,6 +613,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[] = {
550613
.machine_check = snd_soc_acpi_intel_sdca_is_device_rt712_vb,
551614
.sof_tplg_filename = "sof-lnl-rt712-l2-rt1320-l1.tplg"
552615
},
616+
{
617+
.link_mask = BIT(1) | BIT(2) | BIT(3),
618+
.links = lnl_sdw_rt713_vb_l2_rt1320_l13,
619+
.drv_name = "sof_sdw",
620+
.machine_check = snd_soc_acpi_intel_sdca_is_device_rt712_vb,
621+
.sof_tplg_filename = "sof-lnl-rt713-l2-rt1320-l13.tplg"
622+
},
553623
{},
554624
};
555625
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_lnl_sdw_machines);

0 commit comments

Comments
 (0)