ASoC: Add Intel machine driver support for CS35L63
Subsystems (3)
cover ASoC: Add Intel machine driver support for CS35L63
This adds support to the Intel machine drivers for CS35L63 codecs using soundwire, and also adds match entries for the CDB35L63-CB2 on MTL systems.
Richard Fitzgerald (1):
ASoC: Intel: soc-acpi-intel-mtl-match: Add match for CDB35L63-CB2
Stefan Binding (1):
ASoC: intel: sof_sdw: Add support for CS35L63 into machine driver
.../intel/common/soc-acpi-intel-mtl-match.c | 38 +++++++++++++++++++ sound/soc/sdw_utils/soc_sdw_utils.c | 25 ++++++++++++ 2 files changed, 63 insertions(+)
Signature · 1 line
2.43.0
PATCH 1/2 ASoC: intel: sof_sdw: Add support for CS35L63 into machine driver
CS35L63 is very similar to CS35L56, and uses the same driver, so we can use the same configuration.
--- sound/soc/sdw_utils/soc_sdw_utils.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
sound/soc/sdw_utils/soc_sdw_utils.c +25 -0
@@ -510,6 +510,31 @@ struct asoc_sdw_codec_info codec_info_list[] = { }, .dai_num = 2, }, + { + .part_id = 0x3563, + .dais = { + { + .direction = {true, false}, + .dai_name = "cs35l56-sdw1", + .dai_type = SOC_SDW_DAI_TYPE_AMP, + .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID}, + .init = asoc_sdw_cs_amp_init, + .rtd_init = asoc_sdw_cs_spk_rtd_init, + .controls = generic_spk_controls, + .num_controls = ARRAY_SIZE(generic_spk_controls), + .widgets = generic_spk_widgets, + .num_widgets = ARRAY_SIZE(generic_spk_widgets), + }, + { + .direction = {false, true}, + .dai_name = "cs35l56-sdw1c", + .dai_type = SOC_SDW_DAI_TYPE_AMP, + .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_AMP_IN_DAI_ID}, + .rtd_init = asoc_sdw_cs_spk_feedback_rtd_init, + }, + }, + .dai_num = 2, + }, { .part_id = 0x4242, .dais = {
Signature · 1 line
2.43.0
PATCH 2/2 ASoC: Intel: soc-acpi-intel-mtl-match: Add match for CDB35L63-CB2
In reply to Stefan BindingFrom: Richard Fitzgerald <[email protected]>
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.
--- .../intel/common/soc-acpi-intel-mtl-match.c | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+)
sound/soc/intel/common/soc-acpi-intel-mtl-match.c +38 -0
@@ -730,6 +730,24 @@ static const struct snd_soc_acpi_adr_device cs35l56_3_l_adr[] = { } }; +static const struct snd_soc_acpi_adr_device cs35l63_1_fb_adr[] = { + { + .adr =0x00013001FA356301ull , + .num_endpoints =ARRAY_SIZE (cs35l56_l_fb_endpoints), + .endpoints = cs35l56_l_fb_endpoints, + .name_prefix ="AMP1" + }, +}; + +static const struct snd_soc_acpi_adr_device cs35l63_3_fb_adr[] = { + { + .adr =0x00033101FA356301ull , + .num_endpoints =ARRAY_SIZE (cs35l56_r_fb_endpoints), + .endpoints = cs35l56_r_fb_endpoints, + .name_prefix ="AMP2" + }, +}; +static const struct snd_soc_acpi_link_adr rt5682_link2_max98373_link0[] = {/* Expected order: jack -> amp */ {
@@ -1027,6 +1045,20 @@ static const struct snd_soc_acpi_link_adr mtl_cs35l56_x8_link0_link1_fb[] = { {} }; +static const struct snd_soc_acpi_link_adr mtl_cs35l63_x2_link1_link3_fb[] = { + { + .mask =BIT (3 ), + .num_adr =ARRAY_SIZE (cs35l63_3_fb_adr), + .adr_d = cs35l63_3_fb_adr, + }, + { + .mask =BIT (1 ), + .num_adr =ARRAY_SIZE (cs35l63_1_fb_adr), + .adr_d = cs35l63_1_fb_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 */
@@ -1134,6 +1166,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = { .sof_tplg_filename = "sof-mtl-cs42l43-l0.tplg", .get_function_tplg_files = sof_sdw_get_tplg_files, }, + { + .link_mask = BIT(1) | BIT(3), + .links = mtl_cs35l63_x2_link1_link3_fb, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-mtl-cs35l56-l01-fb8.tplg", + }, { .link_mask = GENMASK(3, 0), .links = mtl_3_in_1_sdca,
Signature · 1 line
2.43.0
Mark Brown
maintainerQuoted 8 lines · Stefan Binding
This adds support to the Intel machine drivers for CS35L63 codecs using soundwire, and also adds match entries for the CDB35L63-CB2 on MTL systems.
Richard Fitzgerald (1):
ASoC: Intel: soc-acpi-intel-mtl-match: Add match for CDB35L63-CB2[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: intel: sof_sdw: Add support for CS35L63 into machine driver
commit: 898cd43bde30744e0b821efdf960781c240d4e6c
[2/2] ASoC: Intel: soc-acpi-intel-mtl-match: Add match for CDB35L63-CB2
commit: 8c4d2cc1e1cb9b8c9f26af6c5f19e0c7233e6f81All 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