Merge tag 'v5.15-rc6' into asoc-5.16

Linux 5.15-rc6

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/firmware/Kconfig
Simple merge

diff --cc sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c
Simple merge

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

diff --cc sound/soc/sof/imx/imx8.c
index 20695fe,7e9723a..dd59a74
--- 1/sound/soc/sof/imx/imx8.c
--- 2/sound/soc/sof/imx/imx8.c
+++ b/sound/soc/sof/imx/imx8.c
@@@ -366,9 -365,30 +366,16 @@@ static int imx8_remove(struct snd_sof_d
  /* on i.MX8 there is 1 to 1 match between type and BAR idx */
  static int imx8_get_bar_index(struct snd_sof_dev *sdev, u32 type)
  {
-       return type;
+       /* Only IRAM and SRAM bars are valid */
+       switch (type) {
+       case SOF_FW_BLK_TYPE_IRAM:
+       case SOF_FW_BLK_TYPE_SRAM:
+               return type;
+       default:
+               return -EINVAL;
+       }
  }
  
 -static void imx8_ipc_msg_data(struct snd_sof_dev *sdev,
 -                            struct snd_pcm_substream *substream,
 -                            void *p, size_t sz)
 -{
 -      sof_mailbox_read(sdev, sdev->dsp_box.offset, p, sz);
 -}
 -
 -static int imx8_ipc_pcm_params(struct snd_sof_dev *sdev,
 -                             struct snd_pcm_substream *substream,
 -                             const struct sof_ipc_pcm_params_reply *reply)
 -{
 -      return 0;
 -}
 -
  static struct snd_soc_dai_driver imx8_dai[] = {
  {
        .name = "esai0",

diff --cc sound/soc/sof/imx/imx8m.c
index ae1b48a,892e148..e461898
--- 1/sound/soc/sof/imx/imx8m.c
--- 2/sound/soc/sof/imx/imx8m.c
+++ b/sound/soc/sof/imx/imx8m.c
@@@ -229,22 -228,32 +229,29 @@@ static int imx8m_remove(struct snd_sof_
  /* on i.MX8 there is 1 to 1 match between type and BAR idx */
  static int imx8m_get_bar_index(struct snd_sof_dev *sdev, u32 type)
  {
-       return type;
+       /* Only IRAM and SRAM bars are valid */
+       switch (type) {
+       case SOF_FW_BLK_TYPE_IRAM:
+       case SOF_FW_BLK_TYPE_SRAM:
+               return type;
+       default:
+               return -EINVAL;
+       }
  }
  
 -static void imx8m_ipc_msg_data(struct snd_sof_dev *sdev,
 -                             struct snd_pcm_substream *substream,
 -                             void *p, size_t sz)
 -{
 -      sof_mailbox_read(sdev, sdev->dsp_box.offset, p, sz);
 -}
 -
 -static int imx8m_ipc_pcm_params(struct snd_sof_dev *sdev,
 -                              struct snd_pcm_substream *substream,
 -                              const struct sof_ipc_pcm_params_reply *reply)
 -{
 -      return 0;
 -}
 -
  static struct snd_soc_dai_driver imx8m_dai[] = {
  {
 +      .name = "sai1",
 +      .playback = {
 +              .channels_min = 1,
 +              .channels_max = 32,
 +      },
 +      .capture = {
 +              .channels_min = 1,
 +              .channels_max = 32,
 +      },
 +},
 +{
        .name = "sai3",
        .playback = {
                .channels_min = 1,

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

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

diff --cc sound/soc/sof/xtensa/core.c
Simple merge