Merge tag 'asoc-fix-v6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

ASoC: Fixes for v6.3

Almost all of this is driver specific fixes and new IDs that have come
in during the merge window.  A good chunk of them are simple ones from
me which came about due to a bunch of Mediatek Chromebooks being enabled
in KernelCI, there's more where that came from.

We do have one small feature added to the PCM core by Claudiu Beznea in
order to allow the sequencing required to resolve a noise issue with the
Microchip PDMC driver.

diff --combined sound/soc/amd/yc/acp6x-mach.c
index 36314753923b8c6adf458d5d7af6ca15681ac800,9c183d4c3ce6481ec7b1c39d1dfee61c36bde7ba..4a69ce702360c547e3fc904b1a15d6823227d0c2
--- 1/sound/soc/amd/yc/acp6x-mach.c
--- 2/sound/soc/amd/yc/acp6x-mach.c
+++ b/sound/soc/amd/yc/acp6x-mach.c
@@@ -227,13 -227,6 +227,13 @@@ static const struct dmi_system_id yc_ac
                        DMI_MATCH(DMI_PRODUCT_NAME, "Redmi Book Pro 14 2022"),
                }
        },
 +      {
 +              .driver_data = &acp6x_card,
 +              .matches = {
 +                      DMI_MATCH(DMI_BOARD_VENDOR, "TIMI"),
 +                      DMI_MATCH(DMI_PRODUCT_NAME, "Redmi Book Pro 15 2022"),
 +              }
 +      },
        {
                .driver_data = &acp6x_card,
                .matches = {
@@@ -255,6 -248,20 +255,20 @@@
                        DMI_MATCH(DMI_PRODUCT_NAME, "15NBC1011"),
                }
        },
+       {
+               .driver_data = &acp6x_card,
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "HP"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "OMEN by HP Gaming Laptop 16z-n000"),
+               }
+       },
+       {
+               .driver_data = &acp6x_card,
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "HP"),
+                       DMI_MATCH(DMI_BOARD_NAME, "8A43"),
+               }
+       },
        {}
  };
  

diff --combined sound/soc/intel/boards/sof_rt5682.c
index 71a11d747622a61659cecb62f90cb298ffe6f63a,cda30f73eb52dee22e351af4692284f6662e36e8..4fe448295a902604900d31d7814583363ff6d2c8
--- 1/sound/soc/intel/boards/sof_rt5682.c
--- 2/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@@ -223,6 -223,20 +223,20 @@@ static const struct dmi_system_id sof_r
                                        SOF_RT5682_SSP_AMP(2) |
                                        SOF_RT5682_NUM_HDMIDEV(4)),
        },
+       {
+               .callback = sof_rt5682_quirk_cb,
+               .matches = {
+                       DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Rex"),
+                       DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98360_ALC5682I_I2S"),
+               },
+               .driver_data = (void *)(SOF_RT5682_MCLK_EN |
+                                       SOF_RT5682_SSP_CODEC(2) |
+                                       SOF_SPEAKER_AMP_PRESENT |
+                                       SOF_MAX98360A_SPEAKER_AMP_PRESENT |
+                                       SOF_RT5682_SSP_AMP(0) |
+                                       SOF_RT5682_NUM_HDMIDEV(4)
+                                       ),
+       },
        {
                .callback = sof_rt5682_quirk_cb,
                .matches = {
@@@ -761,6 -775,8 +775,6 @@@ static struct snd_soc_dai_link *sof_car
                        links[id].num_codecs = ARRAY_SIZE(max_98373_components);
                        links[id].init = max_98373_spk_codec_init;
                        links[id].ops = &max_98373_ops;
 -                      /* feedback stream */
 -                      links[id].dpcm_capture = 1;
                } else if (sof_rt5682_quirk &
                                SOF_MAX98360A_SPEAKER_AMP_PRESENT) {
                        max_98360a_dai_link(&links[id]);
@@@ -787,9 -803,6 +801,9 @@@
                links[id].platforms = platform_component;
                links[id].num_platforms = ARRAY_SIZE(platform_component);
                links[id].dpcm_playback = 1;
 +              /* feedback stream or firmware-generated echo reference */
 +              links[id].dpcm_capture = 1;
 +
                links[id].no_pcm = 1;
                links[id].cpus = &cpus[id];
                links[id].num_cpus = 1;
@@@ -1105,6 -1118,15 +1119,15 @@@ static const struct platform_device_id 
                                        SOF_RT5682_SSP_AMP(1) |
                                        SOF_RT5682_NUM_HDMIDEV(4)),
        },
+       {
+               .name = "mtl_mx98360_rt5682",
+               .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
+                                       SOF_RT5682_SSP_CODEC(0) |
+                                       SOF_SPEAKER_AMP_PRESENT |
+                                       SOF_MAX98360A_SPEAKER_AMP_PRESENT |
+                                       SOF_RT5682_SSP_AMP(1) |
+                                       SOF_RT5682_NUM_HDMIDEV(4)),
+       },
        {
                .name = "jsl_rt5682",
                .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |