Skip to content

Commit 26f637f

Browse files
Stefan Bindingbroonie
authored andcommitted
ASoC: Intel: soc-acpi-intel-mtl-match: Add 6 amp CS35L63 with feedback
Add match for 6x CS35L63, 3x on link 2 and 3x on link 3. This is to support 6 amps on the CDB35L63-CB8 board. 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-3-rf@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent e43aefb commit 26f637f

1 file changed

Lines changed: 62 additions & 0 deletions

File tree

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

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,48 @@ static const struct snd_soc_acpi_adr_device cs35l56_6amp_1_fb_adr[] = {
720720
},
721721
};
722722

723+
static const struct snd_soc_acpi_adr_device cs35l63_6amp_3_fb_adr[] = {
724+
{
725+
.adr = 0x00033001FA356301ull,
726+
.num_endpoints = ARRAY_SIZE(cs35l56_l_fb_endpoints),
727+
.endpoints = cs35l56_l_fb_endpoints,
728+
.name_prefix = "AMP1"
729+
},
730+
{
731+
.adr = 0x00033201FA356301ull,
732+
.num_endpoints = ARRAY_SIZE(cs35l56_2_fb_endpoints),
733+
.endpoints = cs35l56_2_fb_endpoints,
734+
.name_prefix = "AMP3"
735+
},
736+
{
737+
.adr = 0x00033401FA356301ull,
738+
.num_endpoints = ARRAY_SIZE(cs35l56_4_fb_endpoints),
739+
.endpoints = cs35l56_4_fb_endpoints,
740+
.name_prefix = "AMP5"
741+
},
742+
};
743+
744+
static const struct snd_soc_acpi_adr_device cs35l63_6amp_2_fb_adr[] = {
745+
{
746+
.adr = 0x00023101FA356301ull,
747+
.num_endpoints = ARRAY_SIZE(cs35l56_r_fb_endpoints),
748+
.endpoints = cs35l56_r_fb_endpoints,
749+
.name_prefix = "AMP2"
750+
},
751+
{
752+
.adr = 0x00023301FA356301ull,
753+
.num_endpoints = ARRAY_SIZE(cs35l56_3_fb_endpoints),
754+
.endpoints = cs35l56_3_fb_endpoints,
755+
.name_prefix = "AMP4"
756+
},
757+
{
758+
.adr = 0x00023501FA356301ull,
759+
.num_endpoints = ARRAY_SIZE(cs35l56_5_fb_endpoints),
760+
.endpoints = cs35l56_5_fb_endpoints,
761+
.name_prefix = "AMP6"
762+
},
763+
};
764+
723765
static const struct snd_soc_acpi_adr_device cs35l56_2_r_adr[] = {
724766
{
725767
.adr = 0x00023201FA355601ull,
@@ -1105,6 +1147,20 @@ static const struct snd_soc_acpi_link_adr mtl_cs35l56_x6_link0_link1_fb[] = {
11051147
{}
11061148
};
11071149

1150+
static const struct snd_soc_acpi_link_adr mtl_cs35l63_x6_link2_link3_fb[] = {
1151+
{
1152+
.mask = BIT(3),
1153+
.num_adr = ARRAY_SIZE(cs35l63_6amp_3_fb_adr),
1154+
.adr_d = cs35l63_6amp_3_fb_adr,
1155+
},
1156+
{
1157+
.mask = BIT(2),
1158+
.num_adr = ARRAY_SIZE(cs35l63_6amp_2_fb_adr),
1159+
.adr_d = cs35l63_6amp_2_fb_adr,
1160+
},
1161+
{}
1162+
};
1163+
11081164
static const struct snd_soc_acpi_link_adr mtl_cs35l63_x2_link1_link3_fb[] = {
11091165
{
11101166
.mask = BIT(3),
@@ -1244,6 +1300,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
12441300
.drv_name = "sof_sdw",
12451301
.sof_tplg_filename = "sof-mtl-cs35l56-l01-fb8.tplg",
12461302
},
1303+
{
1304+
.link_mask = BIT(2) | BIT(3),
1305+
.links = mtl_cs35l63_x6_link2_link3_fb,
1306+
.drv_name = "sof_sdw",
1307+
.sof_tplg_filename = "sof-mtl-cs35l56-l01-fb6.tplg",
1308+
},
12471309
{
12481310
.link_mask = GENMASK(3, 0),
12491311
.links = mtl_3_in_1_sdca,

0 commit comments

Comments
 (0)