diff mbox series

[1/2,SRU,Unstable/Lunar/OEM-6.0/OEM-6.1] UBUNTU: SAUCE: ASoC: Intel: soc-acpi: add configuration for variant of 0C40 product

Message ID 20230103112902.3492073-2-vicamo.yang@canonical.com
State New
Headers show
Series Soundwire support for the Intel RPL Gen 0C40/0C11 platforms | expand

Commit Message

You-Sheng Yang Jan. 3, 2023, 11:29 a.m. UTC 
From: Gongjun Song <gongjun.song@intel.com>

BugLink: https://bugs.launchpad.net/bugs/2000030

Support configuration with SoundWire RT1316 amplifiers on link0 and
link1, and RT711 on link2 for headphone/headset. This product does
not support local microphones.

Change-Id: I7c2daf3d98b38e414d585cb38dcfe7bbe3faa946
Signed-off-by: Gongjun Song <gongjun.song@intel.com>
(cherry picked from commit 9aacc6f5c422b98ef8ea98d190a8f6db9aa447c4 github.com/thesofproject/linux)
Signed-off-by: You-Sheng Yang (vicamo) <vicamo.yang@canonical.com>
---
 .../intel/common/soc-acpi-intel-rpl-match.c   | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
diff mbox series

Patch

diff --git a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
index 31b43116e3d8..c70d85bfedbf 100644
--- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
@@ -203,6 +203,25 @@  static const struct snd_soc_acpi_link_adr rpl_sdw_rt711_link2_rt1316_link01_rt71
 	{}
 };
 
+static const struct snd_soc_acpi_link_adr rpl_sdw_rt711_link2_rt1316_link01[] = {
+	{
+		.mask = BIT(2),
+		.num_adr = ARRAY_SIZE(rt711_sdca_2_adr),
+		.adr_d = rt711_sdca_2_adr,
+	},
+	{
+		.mask = BIT(0),
+		.num_adr = ARRAY_SIZE(rt1316_0_group2_adr),
+		.adr_d = rt1316_0_group2_adr,
+	},
+	{
+		.mask = BIT(1),
+		.num_adr = ARRAY_SIZE(rt1316_1_group2_adr),
+		.adr_d = rt1316_1_group2_adr,
+	},
+	{}
+};
+
 static const struct snd_soc_acpi_link_adr rpl_sdw_rt711_link0_rt1318_link12_rt714_link3[] = {
 	{
 		.mask = BIT(0),
@@ -277,6 +296,12 @@  struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_sdw_machines[] = {
 		.drv_name = "sof_sdw",
 		.sof_tplg_filename = "sof-rpl-rt1316-l12-rt714-l0.tplg",
 	},
+	{
+		.link_mask = 0x7, /* rt711 on link2 & two rt1316s on link0 and link1 */
+		.links = rpl_sdw_rt711_link2_rt1316_link01,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-rpl-rt711-l2-rt1316-l01.tplg",
+	},
 	{
 		.link_mask = 0x1, /* link0 required */
 		.links = rpl_rvp,