ASoC: Merge up release

We need to fix some commits that went into the final release.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/firmware/cirrus/cs_dsp.c
Simple merge

diff --cc drivers/firmware/cirrus/test/cs_dsp_test_bin.c
index 99148ea22df3ea93e0d31dfd8f64292518dd5d3b,2c6486fa95758df69ffd3122ae94cace3aa4af5f..66140caeebb5e2b26d02698dd79393e13c5d7298
--- 1/drivers/firmware/cirrus/test/cs_dsp_test_bin.c
--- 2/drivers/firmware/cirrus/test/cs_dsp_test_bin.c
+++ b/drivers/firmware/cirrus/test/cs_dsp_test_bin.c
@@@ -2229,10 -2226,25 +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;
  

diff --cc drivers/firmware/cirrus/test/cs_dsp_test_bin_error.c
Simple merge

diff --cc sound/soc/codecs/rt1320-sdw.c
Simple merge

diff --cc sound/soc/sof/intel/hda.c
Simple merge