From: Mark Brown <broonie@kernel.org>
Date: Fri, 15 May 2026 13:39:50 +0000 (+0900)
Subject: ASoC: Merge up fixes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf628fa4d403f32e51081fd62f1093c74961e0c7;p=thirdparty%2Fkernel%2Flinux.git

ASoC: Merge up fixes

Merge up the fixes to help CI.
---

bf628fa4d403f32e51081fd62f1093c74961e0c7
diff --cc sound/soc/intel/common/soc-acpi-intel-arl-match.c
index 9782825dd8bfd,52c5b5719f51c..59bfd5248819f
--- a/sound/soc/intel/common/soc-acpi-intel-arl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-arl-match.c
@@@ -291,15 -265,15 +301,24 @@@ static const struct snd_soc_acpi_adr_de
  	}
  };
  
 +static const struct snd_soc_acpi_link_adr arl_n_mrd_es9356_link1[] = {
 +	{
 +		.mask = BIT(1),
 +		.num_adr = ARRAY_SIZE(es9356_adr),
 +		.adr_d = es9356_adr,
 +	},
 +	{}
 +};
 +
+ static const struct snd_soc_acpi_adr_device rt1320_3_group1_adr[] = {
+ 	{
+ 		.adr = 0x000330025D132001ull,
+ 		.num_endpoints = 1,
+ 		.endpoints = &spk_r_endpoint,
+ 		.name_prefix = "rt1320-1"
+ 	}
+ };
+ 
  static const struct snd_soc_acpi_link_adr arl_cs42l43_l0[] = {
  	{
  		.mask = BIT(0),
@@@ -567,19 -563,12 +608,19 @@@ struct snd_soc_acpi_mach snd_soc_acpi_i
  		.sof_tplg_filename = "sof-arl-rt711-l0.tplg",
  	},
  	{
- 		.link_mask = BIT(0) | BIT(2),
- 		.links = arl_rt722_l0_rt1320_l2,
+ 		.link_mask = BIT(2),
+ 		.links = arl_cs42l43_l2,
  		.drv_name = "sof_sdw",
- 		.sof_tplg_filename = "sof-arl-rt722-l0_rt1320-l2.tplg",
+ 		.sof_tplg_filename = "sof-arl-cs42l43-l2.tplg",
  		.get_function_tplg_files = sof_sdw_get_tplg_files,
  	},
 +	{
 +		.link_mask = BIT(1),
 +		.links = arl_n_mrd_es9356_link1,
 +		.drv_name = "sof_sdw",
 +		.sof_tplg_filename = "sof-arl-es9356.tplg",
 +		.get_function_tplg_files = sof_sdw_get_tplg_files,
 +	},
  	{},
  };
  EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_arl_sdw_machines);