| Message ID | 20231204135614.2169624-1-rf@opensource.cirrus.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v3] ASoC: Intel: soc-acpi-intel-tgl-match: add cs42l43 and cs35l56 support | expand |
On 12/4/23 07:56, Richard Fitzgerald wrote: > From: Bard Liao <yung-chuan.liao@linux.intel.com> > > 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) > > Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> > Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> > Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> > --- > 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(+) > > diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c > index 5804926c8b56..e5f721ba5ed4 100644 > --- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c > +++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c > +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" > + } > +}; Don't we need the same change of name_prefix for soc-acpi-intel-mtl-match.c? I see this in the existing code: static const struct snd_soc_acpi_adr_device cs35l56_1_adr[] = { { .adr = 0x00013701FA355601ull, .num_endpoints = 1, .endpoints = &spk_r_endpoint, .name_prefix = "cs35l56-8" }, { .adr = 0x00013601FA355601ull, .num_endpoints = 1, .endpoints = &spk_3_endpoint, .name_prefix = "cs35l56-7" } }; static const struct snd_soc_acpi_adr_device cs35l56_2_adr[] = { { .adr = 0x00023301FA355601ull, .num_endpoints = 1, .endpoints = &spk_l_endpoint, .name_prefix = "cs35l56-1" }, { .adr = 0x00023201FA355601ull, .num_endpoints = 1, .endpoints = &spk_2_endpoint, .name_prefix = "cs35l56-2" } };
On 04/12/2023 14:55, Pierre-Louis Bossart wrote: > > > On 12/4/23 07:56, Richard Fitzgerald wrote: >> From: Bard Liao <yung-chuan.liao@linux.intel.com> >> >> 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) >> >> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> >> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> >> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> >> Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> >> --- >> 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(+) >> >> diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c >> index 5804926c8b56..e5f721ba5ed4 100644 >> --- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c >> +++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c > >> +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" >> + } >> +}; > > Don't we need the same change of name_prefix for > soc-acpi-intel-mtl-match.c? I see this in the existing code: > The chain that Peter sent only has CS35L56 added to tgl-match. I've checked the history of mtl-match and the patch that added CS35L56 there was not cc'd to any cirrus.com email address so we didn't notice it. Otherwise we would have picked this up earlier. alsa-devel is noisy. I haven't got a MTL platform to test on but I can send a separate patch to change mtl-match if you are happy with this prefix change. FWIW I was going to switch to using "cs35l56-n" prefix but while editing all our unit test cases to the new prefix I realized that's a problem if we make similar devices with the same controls. We often make a family of devices that have the same (or very similar) software interface - for example CS35L41/L51 and the CS47L15/35/85/90/92/93/48L92 family. If we use the chip ID as the prefix it would create a bogus change in the ALSA control names even though they are the same controls. OTOH if we used "cs35l56-n" for all cs35l56-like devices (to avoid the name change) it's strange that there's a control named for a chip you don't have... If it quacks like a duck it would be nice if it looks like a duck :)
On Mon, 04 Dec 2023 13:56:14 +0000, Richard Fitzgerald wrote: > 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) > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: Intel: soc-acpi-intel-tgl-match: add cs42l43 and cs35l56 support commit: e17999750649c4bd4ba945419b406d1d1a3e92e2 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
diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c index 5804926c8b56..e5f721ba5ed4 100644 --- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c @@ -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,