Skip to content

Commit 89d6915

Browse files
macchianMac Chiang
authored andcommitted
ASoC: Intel: soc-acpi-ptl-match: add cs42l43_agg_l3_cs35l56_2 support
This patch adds the aggregated mode support: cs42l43 codec with left and right tweeters on soundwire link 3, cs35l56 left and right woofers on soundwire link 2. Signed-off-by: Mac Chiang <mac.chiang@intel.com>
1 parent 31869e9 commit 89d6915

1 file changed

Lines changed: 44 additions & 0 deletions

File tree

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,30 @@ static const struct snd_soc_acpi_adr_device cs42l43_2_adr[] = {
236236
}
237237
};
238238

239+
static const struct snd_soc_acpi_adr_device cs42l43_3_agg_adr[] = {
240+
{
241+
.adr = 0x00033001FA424301ull,
242+
.num_endpoints = ARRAY_SIZE(cs42l43_amp_spkagg_endpoints),
243+
.endpoints = cs42l43_amp_spkagg_endpoints,
244+
.name_prefix = "cs42l43"
245+
}
246+
};
247+
248+
static const struct snd_soc_acpi_adr_device cs35l56_2_lr_adr[] = {
249+
{
250+
.adr = 0x00023001fa355601ull,
251+
.num_endpoints = 1,
252+
.endpoints = &spk_l_endpoint,
253+
.name_prefix = "AMP1"
254+
},
255+
{
256+
.adr = 0x00023101fa355601ull,
257+
.num_endpoints = 1,
258+
.endpoints = &spk_r_endpoint,
259+
.name_prefix = "AMP2"
260+
}
261+
};
262+
239263
static const struct snd_soc_acpi_adr_device cs35l56_1_3amp_adr[] = {
240264
{
241265
.adr = 0x00013001fa355601ull,
@@ -440,6 +464,20 @@ static const struct snd_soc_acpi_adr_device rt1320_3_group2_adr[] = {
440464
}
441465
};
442466

467+
static const struct snd_soc_acpi_link_adr ptl_cs42l43_agg_l3_cs35l56_l2[] = {
468+
{
469+
.mask = BIT(3),
470+
.num_adr = ARRAY_SIZE(cs42l43_3_agg_adr),
471+
.adr_d = cs42l43_3_agg_adr,
472+
},
473+
{
474+
.mask = BIT(2),
475+
.num_adr = ARRAY_SIZE(cs35l56_2_lr_adr),
476+
.adr_d = cs35l56_2_lr_adr,
477+
},
478+
{}
479+
};
480+
443481
static const struct snd_soc_acpi_link_adr ptl_cs42l43_l2_cs35l56x6_l13[] = {
444482
{
445483
.mask = BIT(2),
@@ -675,6 +713,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
675713
.sof_tplg_filename = "sof-ptl-rt712-l3-rt1320-l2.tplg",
676714
.get_function_tplg_files = sof_sdw_get_tplg_files,
677715
},
716+
{
717+
.link_mask = BIT(2) | BIT(3),
718+
.links = ptl_cs42l43_agg_l3_cs35l56_l2,
719+
.drv_name = "sof_sdw",
720+
.sof_tplg_filename = "sof-ptl-cs42l43-agg-l3-cs35l56-l2.tplg",
721+
},
678722
{
679723
.link_mask = BIT(0),
680724
.links = ptl_rvp,

0 commit comments

Comments
 (0)