From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 9 Feb 2026 16:39:11 +0000 (+0100)
Subject: Merge tag 'asoc-v6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd03dd60e8cdd5ef0f0cbc18276c45009bcc51f4;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'asoc-v6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v7.0

This release is almost all abut driers, there's very little core work
here, although some of that driver work is in more generic areas like
SDCA and SOF:

 - Generic SDCA support for reporting jack events.
 - Continuing platform support, cleanup and feature improements for the
   AMD, Intel, Qualcomm and SOF code.
 - Platform description improvements for the Cirrus drivers.
 - Support for NXP i.MX952, Realtek RT1320 and RT5575, and Sophogo
   CV1800B.

We also pulled in one small SPI API update and some more substantial
regmap work (cache description improvements) for use in drivers.
---

dd03dd60e8cdd5ef0f0cbc18276c45009bcc51f4
diff --cc drivers/firmware/cirrus/test/cs_dsp_test_bin.c
index 2c6486fa95758,99148ea22df3e..66140caeebb5e
--- a/drivers/firmware/cirrus/test/cs_dsp_test_bin.c
+++ b/drivers/firmware/cirrus/test/cs_dsp_test_bin.c
@@@ -2226,25 -2229,10 +2231,25 @@@ static int cs_dsp_bin_test_common_init(
  		return ret;
  
  	/* Automatically call cs_dsp_remove() when test case ends */
 -	return kunit_add_action_or_reset(priv->test, _cs_dsp_remove_wrapper, dsp);
 +	ret = kunit_add_action_or_reset(priv->test, _cs_dsp_remove_wrapper, dsp);
 +	if (ret)
 +		return ret;
 +
 +	/*
 +	 * The large number of test cases will cause an unusually large amount
 +	 * of dev_info() messages from cs_dsp, so suppress these.
 +	 */
 +	cs_dsp_suppress_info_messages = true;
 +
 +	return 0;
 +}
 +
 +static void cs_dsp_bin_test_exit(struct kunit *test)
 +{
 +	cs_dsp_suppress_info_messages = false;
  }
  
- static int cs_dsp_bin_test_halo_init(struct kunit *test)
+ static int cs_dsp_bin_test_halo_init_common(struct kunit *test, int wmdr_ver)
  {
  	struct cs_dsp *dsp;