Skip to content

Commit 5ccc838

Browse files
macchianMac Chiang
authored andcommitted
ASoC: Intel: soc-acpi-intel-ptl-match: Add support for rt722_l0_rt1320_l23
This patch adds support for the RT722 codec on SoundWire link 0, and RT1320 left and right amplifiers on links 2 and 3, respectively. The RT722 speaker function is excluded, as it is the aggregate configuration. Signed-off-by: Mac Chiang <[email protected]>
1 parent 3e75531 commit 5ccc838

File tree

1 file changed

+60
-0
lines changed

1 file changed

+60
-0
lines changed

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,21 @@ static const struct snd_soc_acpi_endpoint rt_mf_endpoints[] = {
153153
},
154154
};
155155

156+
static const struct snd_soc_acpi_endpoint jack_0_dmic_2_endpoints[] = {
157+
{
158+
.num = 0,
159+
.aggregated = 0,
160+
.group_position = 0,
161+
.group_id = 0,
162+
},
163+
{
164+
.num = 2,
165+
.aggregated = 0,
166+
.group_position = 0,
167+
.group_id = 0,
168+
},
169+
};
170+
156171
static const struct snd_soc_acpi_endpoint jack_dmic_endpoints[] = {
157172
/* Jack Endpoint */
158173
{
@@ -398,6 +413,15 @@ static const struct snd_soc_acpi_adr_device rt722_0_single_adr[] = {
398413
}
399414
};
400415

416+
static const struct snd_soc_acpi_adr_device rt722_0_jack_dmic_adr[] = {
417+
{
418+
.adr = 0x000030025d072201ull,
419+
.num_endpoints = ARRAY_SIZE(jack_0_dmic_2_endpoints),
420+
.endpoints = jack_0_dmic_2_endpoints,
421+
.name_prefix = "rt722"
422+
}
423+
};
424+
401425
static const struct snd_soc_acpi_adr_device rt722_1_single_adr[] = {
402426
{
403427
.adr = 0x000130025d072201ull,
@@ -452,6 +476,15 @@ static const struct snd_soc_acpi_adr_device rt1320_2_group2_adr[] = {
452476
}
453477
};
454478

479+
static const struct snd_soc_acpi_adr_device rt1320_2_group2_l_adr[] = {
480+
{
481+
.adr = 0x000230025D132001ull,
482+
.num_endpoints = 1,
483+
.endpoints = &spk_l_endpoint,
484+
.name_prefix = "rt1320-1"
485+
}
486+
};
487+
455488
static const struct snd_soc_acpi_adr_device rt1320_3_group2_adr[] = {
456489
{
457490
.adr = 0x000330025D132001ull,
@@ -525,6 +558,25 @@ static const struct snd_soc_acpi_link_adr ptl_rt722_l3[] = {
525558
{}
526559
};
527560

561+
static const struct snd_soc_acpi_link_adr ptl_rt722_l0_rt1320_l23[] = {
562+
{
563+
.mask = BIT(0),
564+
.num_adr = ARRAY_SIZE(rt722_0_jack_dmic_adr),
565+
.adr_d = rt722_0_jack_dmic_adr,
566+
},
567+
{
568+
.mask = BIT(2),
569+
.num_adr = ARRAY_SIZE(rt1320_2_group2_l_adr),
570+
.adr_d = rt1320_2_group2_l_adr,
571+
},
572+
{
573+
.mask = BIT(3),
574+
.num_adr = ARRAY_SIZE(rt1320_3_group2_adr),
575+
.adr_d = rt1320_3_group2_adr,
576+
},
577+
{}
578+
};
579+
528580
static const struct snd_soc_acpi_link_adr ptl_rvp[] = {
529581
{
530582
.mask = BIT(0),
@@ -663,6 +715,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
663715
.drv_name = "sof_sdw",
664716
.sof_tplg_filename = "sof-ptl-cs42l43-l2-cs35l56x6-l13.tplg",
665717
},
718+
{
719+
.link_mask = BIT(0) | BIT(2) | BIT(3),
720+
.links = ptl_rt722_l0_rt1320_l23,
721+
.drv_name = "sof_sdw",
722+
.sof_tplg_filename = "sof-ptl-rt722-l0-rt1320-l23.tplg",
723+
.get_function_tplg_files = sof_sdw_get_tplg_files,
724+
},
666725
{
667726
.link_mask = BIT(1) | BIT(2),
668727
.links = ptl_sdw_rt712_vb_l2_rt1320_l1,
@@ -735,6 +794,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
735794
.sof_tplg_filename = "sof-ptl-rt722.tplg",
736795
.get_function_tplg_files = sof_sdw_get_tplg_files,
737796
},
797+
738798
{},
739799
};
740800
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_ptl_sdw_machines);

0 commit comments

Comments
 (0)