ASoC: Merge up fixes

Merge up the fixes to help CI.

diff --cc MAINTAINERS
Simple merge

diff --cc sound/soc/codecs/Kconfig
Simple merge

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

diff --cc sound/soc/codecs/cs35l56.c
Simple merge

diff --cc sound/soc/intel/common/soc-acpi-intel-arl-match.c
index 9782825dd8bfd10ad87e4648367f48a68f832123,52c5b5719f51c017afaf764fcb5a1c80108bb713..59bfd5248819f49fad2f4f1312973061600e5489
--- 1/sound/soc/intel/common/soc-acpi-intel-arl-match.c
--- 2/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);

diff --cc sound/soc/sdw_utils/soc_sdw_utils.c
Simple merge

diff --cc sound/soc/ti/omap-dmic.c
Simple merge