6.12-stable patches

added patches:
	asoc-intel-adl-add-2xrt1316-audio-configuration.patch
	series

diff --git a/queue-6.12/asoc-intel-adl-add-2xrt1316-audio-configuration.patch b/queue-6.12/asoc-intel-adl-add-2xrt1316-audio-configuration.patch
new file mode 100644 (file)
index 0000000..12aa473
--- /dev/null
+++ b/queue-6.12/asoc-intel-adl-add-2xrt1316-audio-configuration.patch
@@ -0,0 +1,76 @@
+From 8b36447c9ae102539d82d6278971b23b20d87629 Mon Sep 17 00:00:00 2001
+From: Bard Liao <yung-chuan.liao@linux.intel.com>
+Date: Wed, 5 Mar 2025 21:54:35 +0800
+Subject: ASoC: Intel: adl: add 2xrt1316 audio configuration
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Bard Liao <yung-chuan.liao@linux.intel.com>
+
+commit 8b36447c9ae102539d82d6278971b23b20d87629 upstream.
+
+That is a speaker only configuration and 2 rt1316 are on link 0 and 2.
+
+Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
+Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
+Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
+Link: https://patch.msgid.link/20250305135443.201884-2-yung-chuan.liao@linux.intel.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/soc/intel/common/soc-acpi-intel-adl-match.c |   29 ++++++++++++++++++++++
+ 1 file changed, 29 insertions(+)
+
+--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
++++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+@@ -214,6 +214,15 @@ static const struct snd_soc_acpi_adr_dev
+       }
+ };
+ 
++static const struct snd_soc_acpi_adr_device rt1316_2_group2_adr[] = {
++      {
++              .adr = 0x000232025D131601ull,
++              .num_endpoints = 1,
++              .endpoints = &spk_r_endpoint,
++              .name_prefix = "rt1316-2"
++      }
++};
++
+ static const struct snd_soc_acpi_adr_device rt1316_1_single_adr[] = {
+       {
+               .adr = 0x000130025D131601ull,
+@@ -547,6 +556,20 @@ static const struct snd_soc_acpi_link_ad
+       {}
+ };
+ 
++static const struct snd_soc_acpi_link_adr adl_sdw_rt1316_link02[] = {
++      {
++              .mask = BIT(0),
++              .num_adr = ARRAY_SIZE(rt1316_0_group2_adr),
++              .adr_d = rt1316_0_group2_adr,
++      },
++      {
++              .mask = BIT(2),
++              .num_adr = ARRAY_SIZE(rt1316_2_group2_adr),
++              .adr_d = rt1316_2_group2_adr,
++      },
++      {}
++};
++
+ static const struct snd_soc_acpi_codecs adl_max98357a_amp = {
+       .num_codecs = 1,
+       .codecs = {"MX98357A"}
+@@ -749,6 +772,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_in
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-adl-sdw-max98373-rt5682.tplg",
+       },
++      {
++              .link_mask = BIT(0) | BIT(2),
++              .links = adl_sdw_rt1316_link02,
++              .drv_name = "sof_sdw",
++              .sof_tplg_filename = "sof-adl-rt1316-l02.tplg",
++      },
+       {},
+ };
+ EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_adl_sdw_machines);

diff --git a/queue-6.12/series b/queue-6.12/series
new file mode 100644 (file)
index 0000000..5d6c73e
--- /dev/null
+++ b/queue-6.12/series
@@ -0,0 +1 @@
+asoc-intel-adl-add-2xrt1316-audio-configuration.patch