Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 6fa77ef

Browse files
macchianNorman Bintang
authored andcommitted
ANDROID: ASoC: Intel: soc-acpi-ptl-match: add cs42l43_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. Bug: 444302600 Test: cat /proc/asoc/cards, check soundcard is registered. Link: https://github.com/thesofproject/linux/pull/5566/commits (After the PR is merged, it will be picked up by kernel.org in the next timing window.) Upstream-Task: 455997202 Change-Id: I369e67dbd18e284b7be5bb7037b12fe1cb52f7fa Signed-off-by: Mac Chiang <mac.chiang@intel.com>
1 parent afddb90 commit 6fa77ef

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
@@ -225,6 +225,30 @@ static const struct snd_soc_acpi_adr_device cs42l43_2_adr[] = {
225225
}
226226
};
227227

228+
static const struct snd_soc_acpi_adr_device cs42l43_3_g1_adr[] = {
229+
{
230+
.adr = 0x00033001FA424301ull,
231+
.num_endpoints = ARRAY_SIZE(cs42l43_amp_spkagg_endpoints),
232+
.endpoints = cs42l43_amp_spkagg_endpoints,
233+
.name_prefix = "cs42l43"
234+
}
235+
};
236+
237+
static const struct snd_soc_acpi_adr_device cs35l56_2_lr_adr[] = {
238+
{
239+
.adr = 0x00023001fa355601ull,
240+
.num_endpoints = 1,
241+
.endpoints = &spk_l_endpoint,
242+
.name_prefix = "AMP1"
243+
},
244+
{
245+
.adr = 0x00023101fa355601ull,
246+
.num_endpoints = 1,
247+
.endpoints = &spk_r_endpoint,
248+
.name_prefix = "AMP2"
249+
}
250+
};
251+
228252
static const struct snd_soc_acpi_adr_device cs35l56_1_3amp_adr[] = {
229253
{
230254
.adr = 0x00013001fa355601ull,
@@ -429,6 +453,20 @@ static const struct snd_soc_acpi_adr_device rt1320_3_group2_adr[] = {
429453
}
430454
};
431455

456+
static const struct snd_soc_acpi_link_adr ptl_cs42l43_l3_cs35l56_l2[] = {
457+
{
458+
.mask = BIT(3),
459+
.num_adr = ARRAY_SIZE(cs42l43_3_g1_adr),
460+
.adr_d = cs42l43_3_g1_adr,
461+
},
462+
{
463+
.mask = BIT(2),
464+
.num_adr = ARRAY_SIZE(cs35l56_2_lr_adr),
465+
.adr_d = cs35l56_2_lr_adr,
466+
},
467+
{}
468+
};
469+
432470
static const struct snd_soc_acpi_link_adr ptl_cs42l43_l2_cs35l56x6_l13[] = {
433471
{
434472
.mask = BIT(2),
@@ -664,6 +702,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
664702
.sof_tplg_filename = "sof-ptl-rt712-l3-rt1320-l2.tplg",
665703
.get_function_tplg_files = sof_sdw_get_tplg_files,
666704
},
705+
{
706+
.link_mask = BIT(3) | BIT(2),
707+
.links = ptl_cs42l43_l3_cs35l56_l2,
708+
.drv_name = "sof_sdw",
709+
.sof_tplg_filename = "sof-ptl-cs42l43-l3-cs35l56-l2.tplg",
710+
},
667711
{
668712
.link_mask = BIT(0),
669713
.links = ptl_rvp,

0 commit comments

Comments
 (0)