ASoC: Intel: mtl-match: Add cs42l43_l0 cs35l56_l23 for MTL
Subsystems (3)
PATCH v3 1/1 ASoC: Intel: mtl-match: Add cs42l43_l0 cs35l56_l23 for MTL
The layout is configured as:
- Link0: CS42L43 Jack and mics (2ch)
- Link2: 2x CS35L56 Speaker (amps 3 and 4, right)
- Link3: 2x CS35L56 Speaker (amps 1 and 2, left)
Corresponding SOF topology:
https://github.com/thesofproject/sof/pull/8773
---
v2 -> v3: added layout description and link to required SOF topology v1 -> v2: swapped AMP3 and AMP4 prefixes
.../intel/common/soc-acpi-intel-mtl-match.c | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+)
sound/soc/intel/common/soc-acpi-intel-mtl-match.c +57 -0
@@ -377,6 +377,37 @@ static const struct snd_soc_acpi_adr_device cs35l56_2_adr[] = { } }; +static const struct snd_soc_acpi_adr_device cs35l56_2_r_adr[] = { + { + .adr =0x00023201FA355601ull , + .num_endpoints =1 , + .endpoints = &spk_r_endpoint, + .name_prefix ="AMP3" + }, + { + .adr =0x00023301FA355601ull , + .num_endpoints =1 , + .endpoints = &spk_3_endpoint, + .name_prefix ="AMP4" + } + +}; + +static const struct snd_soc_acpi_adr_device cs35l56_3_l_adr[] = { + { + .adr =0x00033001fa355601ull , + .num_endpoints =1 , + .endpoints = &spk_l_endpoint, + .name_prefix ="AMP1" + }, + { + .adr =0x00033101fa355601ull , + .num_endpoints =1 , + .endpoints = &spk_2_endpoint, + .name_prefix ="AMP2" + } +}; +static const struct snd_soc_acpi_link_adr rt5682_link2_max98373_link0[] = {/* Expected order: jack -> amp */ {
@@ -554,6 +585,26 @@ static const struct snd_soc_acpi_link_adr mtl_cs42l43_cs35l56[] = { {} }; +static const struct snd_soc_acpi_link_adr cs42l43_link0_cs35l56_link2_link3[] = { +/* Expected order: jack -> amp */ + { + .mask =BIT (0 ), + .num_adr =ARRAY_SIZE (cs42l43_0_adr), + .adr_d = cs42l43_0_adr, + }, + { + .mask =BIT (2 ), + .num_adr =ARRAY_SIZE (cs35l56_2_r_adr), + .adr_d = cs35l56_2_r_adr, + }, + { + .mask =BIT (3 ), + .num_adr =ARRAY_SIZE (cs35l56_3_l_adr), + .adr_d = cs35l56_3_l_adr, + }, + {} +}; +/* this table is used when there is no I2S codec present */ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {/* mockup tests need to be first */
@@ -599,6 +650,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-mtl-rt1318-l12-rt714-l0.tplg" }, + { + .link_mask = BIT(0) | BIT(2) | BIT(3), + .links = cs42l43_link0_cs35l56_link2_link3, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-mtl-cs42l43-l0-cs35l56-l23.tplg", + }, { .link_mask = GENMASK(2, 0), .links = mtl_cs42l43_cs35l56,
--
2.34.1
Quoted 10 lines · Maciej Strozek
The layout is configured as:
- Link0: CS42L43 Jack and mics (2ch)
- Link2: 2x CS35L56 Speaker (amps 3 and 4, right)
- Link3: 2x CS35L56 Speaker (amps 1 and 2, left)Corresponding SOF topology:
https://github.com/thesofproject/sof/pull/8773Signed-off-by Maciej Strozek <[email protected]>---
Thanks,
Charles
Pierre-Louis Bossart
Acked-byQuoted 6 lines · Charles Keepax
Quoted 5 lines · Maciej Strozek
The layout is configured as:
- Link0: CS42L43 Jack and mics (2ch)
- Link2: 2x CS35L56 Speaker (amps 3 and 4, right)
- Link3: 2x CS35L56 Speaker (amps 1 and 2, left)
Quoted 7 lines
Quoted 5 lines
Corresponding SOF topology:
https://github.com/thesofproject/sof/pull/8773Signed-off-by Maciej Strozek <[email protected]>---
Reviewed-by Charles Keepax <[email protected]>
Mark Brown
maintainerQuoted 9 lines · Maciej Strozek
The layout is configured as:
- Link0: CS42L43 Jack and mics (2ch)
- Link2: 2x CS35L56 Speaker (amps 3 and 4, right)
- Link3: 2x CS35L56 Speaker (amps 1 and 2, left)Corresponding SOF topology:
https://github.com/thesofproject/sof/pull/8773[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: Intel: mtl-match: Add cs42l43_l0 cs35l56_l23 for MTL
commit: 84b22af29ff6c74e09e3faa0ad52c843cca1f426
All 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