archives/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-03-08 03:24:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ASoC: Intel: mtl-match: Add 6-amp matches for CS35L56

Browse source 
Merge series from Richard Fitzgerald <rf@opensource.cirrus.com>:

These two commits add support for 6 amps with feedback, primarily for
the CDB35L56-EIGHT-C and CDB35L63-CB8 and similar hardware.
This commit is contained in:
Mark Brown 2025-12-19 13:25:16 +00:00
commit 56d953a8d0
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 104 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

104
sound/soc/intel/common/soc-acpi-intel-mtl-match.c
View file

@ -699,6 +699,69 @@ static const struct snd_soc_acpi_adr_device cs35l56_1_fb_adr[] = {
},
};
static const struct snd_soc_acpi_adr_device cs35l56_6amp_1_fb_adr[] = {
{
.adr = 0x00013701FA355601ull,
.num_endpoints = ARRAY_SIZE(cs35l56_r_fb_endpoints),
.endpoints = cs35l56_r_fb_endpoints,
.name_prefix = "AMP6"
},
{
.adr = 0x00013601FA355601ull,
.num_endpoints = ARRAY_SIZE(cs35l56_3_fb_endpoints),
.endpoints = cs35l56_3_fb_endpoints,
.name_prefix = "AMP5"
},
{
.adr = 0x00013501FA355601ull,
.num_endpoints = ARRAY_SIZE(cs35l56_5_fb_endpoints),
.endpoints = cs35l56_5_fb_endpoints,
.name_prefix = "AMP4"
},
};
static const struct snd_soc_acpi_adr_device cs35l63_6amp_3_fb_adr[] = {
{
.adr = 0x00033001FA356301ull,
.num_endpoints = ARRAY_SIZE(cs35l56_l_fb_endpoints),
.endpoints = cs35l56_l_fb_endpoints,
.name_prefix = "AMP1"
},
{
.adr = 0x00033201FA356301ull,
.num_endpoints = ARRAY_SIZE(cs35l56_2_fb_endpoints),
.endpoints = cs35l56_2_fb_endpoints,
.name_prefix = "AMP3"
},
{
.adr = 0x00033401FA356301ull,
.num_endpoints = ARRAY_SIZE(cs35l56_4_fb_endpoints),
.endpoints = cs35l56_4_fb_endpoints,
.name_prefix = "AMP5"
},
};
static const struct snd_soc_acpi_adr_device cs35l63_6amp_2_fb_adr[] = {
{
.adr = 0x00023101FA356301ull,
.num_endpoints = ARRAY_SIZE(cs35l56_r_fb_endpoints),
.endpoints = cs35l56_r_fb_endpoints,
.name_prefix = "AMP2"
},
{
.adr = 0x00023301FA356301ull,
.num_endpoints = ARRAY_SIZE(cs35l56_3_fb_endpoints),
.endpoints = cs35l56_3_fb_endpoints,
.name_prefix = "AMP4"
},
{
.adr = 0x00023501FA356301ull,
.num_endpoints = ARRAY_SIZE(cs35l56_5_fb_endpoints),
.endpoints = cs35l56_5_fb_endpoints,
.name_prefix = "AMP6"
},
};
static const struct snd_soc_acpi_adr_device cs35l56_2_r_adr[] = {
{
.adr = 0x00023201FA355601ull,
@ -1069,6 +1132,35 @@ static const struct snd_soc_acpi_link_adr mtl_cs35l56_x8_link0_link1_fb[] = {
{}
};
static const struct snd_soc_acpi_link_adr mtl_cs35l56_x6_link0_link1_fb[] = {
{
.mask = BIT(1),
.num_adr = ARRAY_SIZE(cs35l56_6amp_1_fb_adr),
.adr_d = cs35l56_6amp_1_fb_adr,
},
{
.mask = BIT(0),
/* First 3 amps in cs35l56_0_fb_adr */
.num_adr = 3,
.adr_d = cs35l56_0_fb_adr,
},
{}
};
static const struct snd_soc_acpi_link_adr mtl_cs35l63_x6_link2_link3_fb[] = {
{
.mask = BIT(3),
.num_adr = ARRAY_SIZE(cs35l63_6amp_3_fb_adr),
.adr_d = cs35l63_6amp_3_fb_adr,
},
{
.mask = BIT(2),
.num_adr = ARRAY_SIZE(cs35l63_6amp_2_fb_adr),
.adr_d = cs35l63_6amp_2_fb_adr,
},
{}
};
static const struct snd_soc_acpi_link_adr mtl_cs35l63_x2_link1_link3_fb[] = {
{
.mask = BIT(3),
@ -1189,6 +1281,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
.sof_tplg_filename = "sof-mtl-cs35l56-l01-fb8.tplg",
.get_function_tplg_files = sof_sdw_get_tplg_files,
},
{
.link_mask = BIT(0) | BIT(1),
.links = mtl_cs35l56_x6_link0_link1_fb,
.drv_name = "sof_sdw",
.sof_tplg_filename = "sof-mtl-cs35l56-l01-fb6.tplg"
},
{
.link_mask = BIT(0),
.links = mtl_cs42l43_l0,
@ -1202,6 +1300,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
.drv_name = "sof_sdw",
.sof_tplg_filename = "sof-mtl-cs35l56-l01-fb8.tplg",
},
{
.link_mask = BIT(2) | BIT(3),
.links = mtl_cs35l63_x6_link2_link3_fb,
.drv_name = "sof_sdw",
.sof_tplg_filename = "sof-mtl-cs35l56-l01-fb6.tplg",
},
{
.link_mask = GENMASK(3, 0),
.links = mtl_3_in_1_sdca,