From: Takashi Iwai <tiwai@suse.de>
Date: Sat, 14 Sep 2024 08:16:12 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: v6.12-rc1~169^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64c0ce555ad2d84f497f5f584ddd31e87ac690a2;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'for-linus' into for-next

Pull 6.11 fixes to 6.12-devel branch

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

64c0ce555ad2d84f497f5f584ddd31e87ac690a2
diff --cc sound/soc/intel/common/soc-acpi-intel-lnl-match.c
index 2522e6f117497,edfb668d0580d..3c4e0c7ca8eee
--- a/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
@@@ -267,41 -208,9 +267,42 @@@ static const struct snd_soc_acpi_link_a
  		.num_adr = ARRAY_SIZE(cs42l43_0_adr),
  		.adr_d = cs42l43_0_adr,
  	},
+ 	{}
  };
  
 +static const struct snd_soc_acpi_link_adr lnl_cs42l43_l0_cs35l56_l3[] = {
 +	{
 +		.mask = BIT(0),
 +		.num_adr = ARRAY_SIZE(cs42l43_0_adr),
 +		.adr_d = cs42l43_0_adr,
 +	},
 +	{
 +		.mask = BIT(3),
 +		.num_adr = ARRAY_SIZE(cs35l56_3_lr_adr),
 +		.adr_d = cs35l56_3_lr_adr,
 +	},
 +	{}
 +};
 +
 +static const struct snd_soc_acpi_link_adr lnl_cs42l43_l0_cs35l56_l23[] = {
 +	{
 +		.mask = BIT(0),
 +		.num_adr = ARRAY_SIZE(cs42l43_0_adr),
 +		.adr_d = cs42l43_0_adr,
 +	},
 +	{
 +		.mask = BIT(2),
 +		.num_adr = ARRAY_SIZE(cs35l56_2_l_adr),
 +		.adr_d = cs35l56_2_l_adr,
 +	},
 +	{
 +		.mask = BIT(3),
 +		.num_adr = ARRAY_SIZE(cs35l56_3_r_adr),
 +		.adr_d = cs35l56_3_r_adr,
 +	},
 +	{}
 +};
 +
  static const struct snd_soc_acpi_link_adr lnl_rvp[] = {
  	{
  		.mask = BIT(0),