Merge branch 'asoc-5.11' into asoc-5.12

diff --cc Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-rt5682.yaml
Simple merge

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

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

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

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

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

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

diff --cc sound/soc/intel/common/soc-acpi-intel-tgl-match.c
Simple merge

diff --cc sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
Simple merge

diff --cc sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
Simple merge

diff --cc sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
index f4b09672af8f78e50ca30f7a56d49f5ec9ae1be8,ae2c748eb19c40a490f84880820fc97093f5b895..a606133951b707cecdaaa0b8c7471ce95c8b1df2
--- 1/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
--- 2/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
+++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
@@@ -402,10 -397,57 +402,57 @@@ mt8192_mt6359_cap1_startup(struct snd_p
        return 0;
  }
  
 -static const struct snd_soc_ops mt8192_mt6359_rt1015_rt5682_capture1_ops = {
 -      .startup = mt8192_mt6359_rt1015_rt5682_cap1_startup,
 +static const struct snd_soc_ops mt8192_mt6359_capture1_ops = {
 +      .startup = mt8192_mt6359_cap1_startup,
  };
  
+ static int
+ mt8192_mt6359_rt5682_startup(struct snd_pcm_substream *substream)
+ {
+       static const unsigned int channels[] = {
+               1, 2
+       };
+       static const struct snd_pcm_hw_constraint_list constraints_channels = {
+               .count = ARRAY_SIZE(channels),
+               .list = channels,
+               .mask = 0,
+       };
+       static const unsigned int rates[] = {
+               48000
+       };
+       static const struct snd_pcm_hw_constraint_list constraints_rates = {
+               .count = ARRAY_SIZE(rates),
+               .list  = rates,
+               .mask = 0,
+       };
+ 
+       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+       struct snd_pcm_runtime *runtime = substream->runtime;
+       int ret;
+ 
+       ret = snd_pcm_hw_constraint_list(runtime, 0,
+                                        SNDRV_PCM_HW_PARAM_CHANNELS,
+                                        &constraints_channels);
+       if (ret < 0) {
+               dev_err(rtd->dev, "hw_constraint_list channels failed\n");
+               return ret;
+       }
+ 
+       ret = snd_pcm_hw_constraint_list(runtime, 0,
+                                        SNDRV_PCM_HW_PARAM_RATE,
+                                        &constraints_rates);
+       if (ret < 0) {
+               dev_err(rtd->dev, "hw_constraint_list rate failed\n");
+               return ret;
+       }
+ 
+       return 0;
+ }
+ 
+ static const struct snd_soc_ops mt8192_mt6359_rt5682_ops = {
+       .startup = mt8192_mt6359_rt5682_startup,
+ };
+ 
  /* FE */
  SND_SOC_DAILINK_DEFS(playback1,
                     DAILINK_COMP_ARRAY(COMP_CPU("DL1")),

diff --cc sound/soc/qcom/lpass-cpu.c
index af539e0d7e565e5c3c97a272010c2fb3e3bcadf6,8e5415c9234f1e8bea2e30b35582bea7270b6d09..c642e5f8f28c4c942689059d8ee9a98506621a56
--- 1/sound/soc/qcom/lpass-cpu.c
--- 2/sound/soc/qcom/lpass-cpu.c
+++ b/sound/soc/qcom/lpass-cpu.c
@@@ -791,11 -810,14 +808,11 @@@ int asoc_qcom_lpass_cpu_platform_probe(
                res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "lpass-hdmiif");
  
                drvdata->hdmiif = devm_ioremap_resource(dev, res);
 -              if (IS_ERR((void const __force *)drvdata->hdmiif)) {
 -                      dev_err(dev, "error mapping reg resource: %ld\n",
 -                                      PTR_ERR((void const __force *)drvdata->hdmiif));
 -                      return PTR_ERR((void const __force *)drvdata->hdmiif);
 -              }
 +              if (IS_ERR(drvdata->hdmiif))
 +                      return PTR_ERR(drvdata->hdmiif);
  
                lpass_hdmi_regmap_config.max_register = LPAIF_HDMI_RDMAPER_REG(variant,
-                                       variant->hdmi_rdma_channels);
+                                       variant->hdmi_rdma_channels - 1);
                drvdata->hdmiif_map = devm_regmap_init_mmio(dev, drvdata->hdmiif,
                                        &lpass_hdmi_regmap_config);
                if (IS_ERR(drvdata->hdmiif_map)) {

diff --cc sound/soc/soc-topology.c
Simple merge

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

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

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

diff --cc sound/soc/sof/loader.c
Simple merge

diff --cc sound/soc/sof/sof-pci-dev.c
Simple merge

diff --cc sound/soc/sof/topology.c
Simple merge