Skip to contentSkip to conversation

ASoC: amd: acp: Add more ACP7.0 match entries for Cirrus Logic parts

PATCH In review Simon Trimmer 2 participants 2 messages Oct 7 – Oct 8

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: amd: acp: Add more ACP7.0 match entries for Cirrus Logic parts

This adds the following SoundWire configuration:

    cs42l43b link 0 UID 1
    cs35l57 link 0 UID 0
    cs35l57 link 0 UID 1
---
 sound/soc/amd/acp/amd-acp70-acpi-match.c | 35 ++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
sound/soc/amd/acp/amd-acp70-acpi-match.c +35 -0
index 2a9da6de7bbca..c2f0479301ebd 100644
@@ -335,6 +335,27 @@ static const struct snd_soc_acpi_adr_device cs42l43b_l0u1_adr[] = {
 	}
 };
 
+static const struct snd_soc_acpi_adr_device cs42l43b_l0u1_cs35l57x2_l0u01_adr[] = {
+	{
+		.adr = 0x00003101FA2A3B01ull,
+		.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
+		.endpoints = cs42l43_endpoints,
+		.name_prefix = "cs42l43"
+	},
+	{
+		.adr = 0x00003001FA355701ull,
+		.num_endpoints = 1,
+		.endpoints = &spk_l_endpoint,
+		.name_prefix = "AMP1"
+	},
+	{
+		.adr = 0x00003101FA355701ull,
+		.num_endpoints = 1,
+		.endpoints = &spk_r_endpoint,
+		.name_prefix = "AMP2"
+	},
+};
+
 static const struct snd_soc_acpi_adr_device cs42l43_l1u0_cs35l56x4_l1u0123_adr[] = {
 	{
 		.adr = 0x00013001FA424301ull,
@@ -438,6 +459,15 @@ static const struct snd_soc_acpi_link_adr acp70_cs42l43_l0u0_cs35l56x4_l1u3210[]
 	{}
 };
 
+static const struct snd_soc_acpi_link_adr acp70_cs42l43b_l0u1_cs35l57x2_l0u01[] = {
+	{
+		.mask = BIT(0),
+		.num_adr = ARRAY_SIZE(cs42l43b_l0u1_cs35l57x2_l0u01_adr),
+		.adr_d = cs42l43b_l0u1_cs35l57x2_l0u01_adr,
+	},
+	{}
+};
+
 static const struct snd_soc_acpi_link_adr acp70_cs42l43_l1u0_cs35l56x4_l1u0123[] = {
 	{
 		.mask = BIT(1),
@@ -820,6 +850,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sdw_machines[] = {
 		.links = acp70_cs42l45_l1u0_cs35l63x2_l0u01,
 		.drv_name = "amd_sdw",
 	},
+	{
+		.link_mask = BIT(0),
+		.links = acp70_cs42l43b_l0u1_cs35l57x2_l0u01,
+		.drv_name = "amd_sdw",
+	},
 	{
 		.link_mask = BIT(1),
 		.links = acp70_cs42l43_l1u0_cs35l56x4_l1u0123,
Signature · 1 line
2.43.0
maintainer
#1 lore raw
Quoted 1 line · Simon Trimmer

ASoC: amd: acp: Add more ACP7.0 match entries for Cirrus Logic parts

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.3

Thanks!

[1/1] ASoC: amd: acp: Add more ACP7.0 match entries for Cirrus Logic parts

      https://git.kernel.org/broonie/sound/c/9ca0d0d02492

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