ASoC: Intel: soc-acpi-intel-tgl-match: add cs42l43 and cs56l56 support
Subsystems (3)
PATCH v2 1/1 ASoC: Intel: soc-acpi-intel-tgl-match: add cs42l43 and cs56l56 support
From: Bard Liao <[email protected]>
This is a test configuration for UpExtreme with Cirrus Logic CS35L56-EIGHT-C board.
The codec layout is configured as:
- Link3: CS42L43 Jack
- Link0: 2x CS35L56 Speaker (amps 1 and 2)
- Link1: 2x CS35L56 Speaker (amps 7 and 8)
---
Changes since V1:
- Changed ALSA prefixes for CS35L56 to 'AMPn'
- Renumbered the CS35L56 prefixes to match the numbering of the OUTn speaker sockets on the EIGHT-C board
--- .../intel/common/soc-acpi-intel-tgl-match.c | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+)
sound/soc/intel/common/soc-acpi-intel-tgl-match.c +78 -0
@@ -41,6 +41,20 @@ static const struct snd_soc_acpi_endpoint spk_r_endpoint = { .group_id = 1, }; +static const struct snd_soc_acpi_endpoint spk_2_endpoint = { + .num =0 , + .aggregated =1 , + .group_position =2 , + .group_id =1 , +}; + +static const struct snd_soc_acpi_endpoint spk_3_endpoint = { + .num =0 , + .aggregated =1 , + .group_position =3 , + .group_id =1 , +}; +static const struct snd_soc_acpi_endpoint rt712_endpoints[] = { { .num =0 ,
@@ -400,6 +414,64 @@ static const struct snd_soc_acpi_link_adr tgl_712_only[] = { {} }; +static const struct snd_soc_acpi_adr_device cs42l43_3_adr[] = { + { + .adr =0x00033001FA424301ull , + .num_endpoints =1 , + .endpoints = &single_endpoint, + .name_prefix ="cs42l43" + } +}; + +static const struct snd_soc_acpi_adr_device cs35l56_0_adr[] = { + { + .adr =0x00003301FA355601ull , + .num_endpoints =1 , + .endpoints = &spk_r_endpoint, + .name_prefix ="AMP1" + }, + { + .adr =0x00003201FA355601ull , + .num_endpoints =1 , + .endpoints = &spk_3_endpoint, + .name_prefix ="AMP2" + } +}; + +static const struct snd_soc_acpi_adr_device cs35l56_1_adr[] = { + { + .adr =0x00013701FA355601ull , + .num_endpoints =1 , + .endpoints = &spk_l_endpoint, + .name_prefix ="AMP8" + }, + { + .adr =0x00013601FA355601ull , + .num_endpoints =1 , + .endpoints = &spk_2_endpoint, + .name_prefix ="AMP7" + } +}; + +static const struct snd_soc_acpi_link_adr tgl_cs42l43_cs35l56[] = { + { + .mask =BIT (3 ), + .num_adr =ARRAY_SIZE (cs42l43_3_adr), + .adr_d = cs42l43_3_adr, + }, + { + .mask =BIT (0 ), + .num_adr =ARRAY_SIZE (cs35l56_0_adr), + .adr_d = cs35l56_0_adr, + }, + { + .mask =BIT (1 ), + .num_adr =ARRAY_SIZE (cs35l56_1_adr), + .adr_d = cs35l56_1_adr, + }, + {} +}; +static const struct snd_soc_acpi_codecs tgl_max98373_amp = { .num_codecs =1 , .codecs = {"MX98373" }
@@ -494,6 +566,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-tgl-rt715-rt711-rt1308-mono.tplg", }, + { + .link_mask = 0xB, + .links = tgl_cs42l43_cs35l56, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-tgl-cs42l43-l3-cs35l56-l01.tplg", + }, { .link_mask = 0xF, /* 4 active links required */ .links = tgl_3_in_1_default,
Signature · 1 line
2.30.2
Quoted 5 lines · Richard Fitzgerald
From: Bard Liao <[email protected]>
This is a test configuration for UpExtreme with Cirrus Logic CS35L56-EIGHT-C board.
Please ignore this. I've just noticed the typo in the commit title (carried over from V1). I'll send a V3 with this corrected.