ASoC: Intel: mtl-match: Add 6-amp matches for CS35L56 and CS35L63
Subsystems (3)
cover ASoC: Intel: mtl-match: Add 6-amp matches for CS35L56 and CS35L63
These two commits add support for 6 amps with feedback, primarily for the CDB35L56-EIGHT-C and CDB35L63-CB8 and similar hardware.
Stefan Binding (2):
ASoC: Intel: soc-acpi-intel-mtl-match: Add 6 amp CS35L56 with feedback
ASoC: Intel: soc-acpi-intel-mtl-match: Add 6 amp CS35L63 with feedback
.../intel/common/soc-acpi-intel-mtl-match.c | 104 ++++++++++++++++++ 1 file changed, 104 insertions(+)
Signature · 1 line
2.47.3
PATCH 1/2 ASoC: Intel: soc-acpi-intel-mtl-match: Add 6 amp CS35L56 with feedback
From: Stefan Binding <[email protected]>
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.
--- .../intel/common/soc-acpi-intel-mtl-match.c | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+)
sound/soc/intel/common/soc-acpi-intel-mtl-match.c +42 -0
@@ -699,6 +699,27 @@ 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 cs35l56_2_r_adr[] = { { .adr =0x00023201FA355601ull ,
@@ -1069,6 +1090,21 @@ 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_x2_link1_link3_fb[] = { { .mask =BIT (3 ),
@@ -1189,6 +1225,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,
Signature · 1 line
2.47.3
PATCH 2/2 ASoC: Intel: soc-acpi-intel-mtl-match: Add 6 amp CS35L63 with feedback
In reply to Richard FitzgeraldFrom: Stefan Binding <[email protected]>
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.
--- .../intel/common/soc-acpi-intel-mtl-match.c | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+)
sound/soc/intel/common/soc-acpi-intel-mtl-match.c +62 -0
@@ -720,6 +720,48 @@ static const struct snd_soc_acpi_adr_device cs35l56_6amp_1_fb_adr[] = { }, }; +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 ,
@@ -1105,6 +1147,20 @@ static const struct snd_soc_acpi_link_adr mtl_cs35l56_x6_link0_link1_fb[] = { {} }; +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 ),
@@ -1244,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,
Signature · 1 line
2.47.3
Mark Brown
maintainerQuoted 8 lines · Richard Fitzgerald
These two commits add support for 6 amps with feedback, primarily for the CDB35L56-EIGHT-C and CDB35L63-CB8 and similar hardware.
Stefan Binding (2):
ASoC: Intel: soc-acpi-intel-mtl-match: Add 6 amp CS35L56 with feedback
ASoC: Intel: soc-acpi-intel-mtl-match: Add 6 amp CS35L63 with feedback[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: Intel: soc-acpi-intel-mtl-match: Add 6 amp CS35L56 with feedback
commit: e43aefb771e82f2e13a435c37ef55813f4140f93
[2/2] ASoC: Intel: soc-acpi-intel-mtl-match: Add 6 amp CS35L63 with feedback
commit: 26f637fa08879152b9c82417d0d4096019b386ffAll being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark