Skip to content

Commit 8c4d2cc

Browse files
rfvirgilbroonie
authored andcommitted
ASoC: Intel: soc-acpi-intel-mtl-match: Add match for CDB35L63-CB2
This adds a match entry for using all the amps on a CDB35L63-CB2 board without the CS42L43 codec. Configuration is: SDW3: 1x CS35L63 (OUT1) SDW1: 1x CS35L63 (OUT2) Speaker playback and amp feedback are aggregated. Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com> Link: https://patch.msgid.link/20250516152107.210994-3-sbinding@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 898cd43 commit 8c4d2cc

File tree

1 file changed

+38
-0
lines changed

1 file changed

+38
-0
lines changed

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,24 @@ static const struct snd_soc_acpi_adr_device cs35l56_3_l_adr[] = {
729729
}
730730
};
731731

732+
static const struct snd_soc_acpi_adr_device cs35l63_1_fb_adr[] = {
733+
{
734+
.adr = 0x00013001FA356301ull,
735+
.num_endpoints = ARRAY_SIZE(cs35l56_l_fb_endpoints),
736+
.endpoints = cs35l56_l_fb_endpoints,
737+
.name_prefix = "AMP1"
738+
},
739+
};
740+
741+
static const struct snd_soc_acpi_adr_device cs35l63_3_fb_adr[] = {
742+
{
743+
.adr = 0x00033101FA356301ull,
744+
.num_endpoints = ARRAY_SIZE(cs35l56_r_fb_endpoints),
745+
.endpoints = cs35l56_r_fb_endpoints,
746+
.name_prefix = "AMP2"
747+
},
748+
};
749+
732750
static const struct snd_soc_acpi_link_adr rt5682_link2_max98373_link0[] = {
733751
/* Expected order: jack -> amp */
734752
{
@@ -1026,6 +1044,20 @@ static const struct snd_soc_acpi_link_adr mtl_cs35l56_x8_link0_link1_fb[] = {
10261044
{}
10271045
};
10281046

1047+
static const struct snd_soc_acpi_link_adr mtl_cs35l63_x2_link1_link3_fb[] = {
1048+
{
1049+
.mask = BIT(3),
1050+
.num_adr = ARRAY_SIZE(cs35l63_3_fb_adr),
1051+
.adr_d = cs35l63_3_fb_adr,
1052+
},
1053+
{
1054+
.mask = BIT(1),
1055+
.num_adr = ARRAY_SIZE(cs35l63_1_fb_adr),
1056+
.adr_d = cs35l63_1_fb_adr,
1057+
},
1058+
{}
1059+
};
1060+
10291061
/* this table is used when there is no I2S codec present */
10301062
struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
10311063
/* mockup tests need to be first */
@@ -1126,6 +1158,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
11261158
.drv_name = "sof_sdw",
11271159
.sof_tplg_filename = "sof-mtl-cs42l43-l0.tplg",
11281160
},
1161+
{
1162+
.link_mask = BIT(1) | BIT(3),
1163+
.links = mtl_cs35l63_x2_link1_link3_fb,
1164+
.drv_name = "sof_sdw",
1165+
.sof_tplg_filename = "sof-mtl-cs35l56-l01-fb8.tplg",
1166+
},
11291167
{
11301168
.link_mask = GENMASK(3, 0),
11311169
.links = mtl_3_in_1_sdca,

0 commit comments

Comments
 (0)