Skip to content

Commit e43aefb

Browse files
Stefan Bindingbroonie
authored andcommitted
ASoC: Intel: soc-acpi-intel-mtl-match: Add 6 amp CS35L56 with feedback
Add a match for 6x CS35L56, 3x on link 0 and 3x on link 1. To support the CDB35L56-EIGHT-C board using 6 amps. This is the same as the existing 8-amp configuration mtl_cs35l56_x8_link0_link1_fb, but reduced to 6 amps. Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com> Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> Link: https://patch.msgid.link/20251217163227.1186373-2-rf@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 8f0b4cc commit e43aefb

1 file changed

Lines changed: 42 additions & 0 deletions

File tree

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,27 @@ static const struct snd_soc_acpi_adr_device cs35l56_1_fb_adr[] = {
699699
},
700700
};
701701

702+
static const struct snd_soc_acpi_adr_device cs35l56_6amp_1_fb_adr[] = {
703+
{
704+
.adr = 0x00013701FA355601ull,
705+
.num_endpoints = ARRAY_SIZE(cs35l56_r_fb_endpoints),
706+
.endpoints = cs35l56_r_fb_endpoints,
707+
.name_prefix = "AMP6"
708+
},
709+
{
710+
.adr = 0x00013601FA355601ull,
711+
.num_endpoints = ARRAY_SIZE(cs35l56_3_fb_endpoints),
712+
.endpoints = cs35l56_3_fb_endpoints,
713+
.name_prefix = "AMP5"
714+
},
715+
{
716+
.adr = 0x00013501FA355601ull,
717+
.num_endpoints = ARRAY_SIZE(cs35l56_5_fb_endpoints),
718+
.endpoints = cs35l56_5_fb_endpoints,
719+
.name_prefix = "AMP4"
720+
},
721+
};
722+
702723
static const struct snd_soc_acpi_adr_device cs35l56_2_r_adr[] = {
703724
{
704725
.adr = 0x00023201FA355601ull,
@@ -1069,6 +1090,21 @@ static const struct snd_soc_acpi_link_adr mtl_cs35l56_x8_link0_link1_fb[] = {
10691090
{}
10701091
};
10711092

1093+
static const struct snd_soc_acpi_link_adr mtl_cs35l56_x6_link0_link1_fb[] = {
1094+
{
1095+
.mask = BIT(1),
1096+
.num_adr = ARRAY_SIZE(cs35l56_6amp_1_fb_adr),
1097+
.adr_d = cs35l56_6amp_1_fb_adr,
1098+
},
1099+
{
1100+
.mask = BIT(0),
1101+
/* First 3 amps in cs35l56_0_fb_adr */
1102+
.num_adr = 3,
1103+
.adr_d = cs35l56_0_fb_adr,
1104+
},
1105+
{}
1106+
};
1107+
10721108
static const struct snd_soc_acpi_link_adr mtl_cs35l63_x2_link1_link3_fb[] = {
10731109
{
10741110
.mask = BIT(3),
@@ -1189,6 +1225,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
11891225
.sof_tplg_filename = "sof-mtl-cs35l56-l01-fb8.tplg",
11901226
.get_function_tplg_files = sof_sdw_get_tplg_files,
11911227
},
1228+
{
1229+
.link_mask = BIT(0) | BIT(1),
1230+
.links = mtl_cs35l56_x6_link0_link1_fb,
1231+
.drv_name = "sof_sdw",
1232+
.sof_tplg_filename = "sof-mtl-cs35l56-l01-fb6.tplg"
1233+
},
11921234
{
11931235
.link_mask = BIT(0),
11941236
.links = mtl_cs42l43_l0,

0 commit comments

Comments
 (0)