Merge existing fixes from asoc/for-5.13

diff --combined sound/soc/amd/raven/acp3x-pcm-dma.c
index f22bb2bdf527a94364e78a2892fbf0722abdb94d,2447a1e6e913f5a2684e66707c8bd1aa426ec5cf..8148b0d22e880398fbaed3f9e0fbd5a1bffbb661
--- 1/sound/soc/amd/raven/acp3x-pcm-dma.c
--- 2/sound/soc/amd/raven/acp3x-pcm-dma.c
+++ b/sound/soc/amd/raven/acp3x-pcm-dma.c
@@@ -24,7 -24,8 +24,7 @@@ static const struct snd_pcm_hardware ac
                SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
                SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME,
        .formats = SNDRV_PCM_FMTBIT_S16_LE |  SNDRV_PCM_FMTBIT_S8 |
 -                 SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S24_LE |
 -                 SNDRV_PCM_FMTBIT_S32_LE,
 +                 SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S32_LE,
        .channels_min = 2,
        .channels_max = 8,
        .rates = SNDRV_PCM_RATE_8000_96000,
@@@ -44,7 -45,8 +44,7 @@@ static const struct snd_pcm_hardware ac
                SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
                SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME,
        .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 |
 -                 SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S24_LE |
 -                 SNDRV_PCM_FMTBIT_S32_LE,
 +                 SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S32_LE,
        .channels_min = 2,
        .channels_max = 2,
        .rates = SNDRV_PCM_RATE_8000_48000,
@@@ -235,10 -237,6 +235,6 @@@ static int acp3x_dma_open(struct snd_so
                return ret;
        }
  
-       if (!adata->play_stream && !adata->capture_stream &&
-           !adata->i2ssp_play_stream && !adata->i2ssp_capture_stream)
-               rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB);
- 
        i2s_data->acp3x_base = adata->acp3x_base;
        runtime->private_data = i2s_data;
        return ret;
@@@ -365,12 -363,6 +361,6 @@@ static int acp3x_dma_close(struct snd_s
                }
        }
  
-       /* Disable ACP irq, when the current stream is being closed and
-        * another stream is also not active.
-        */
-       if (!adata->play_stream && !adata->capture_stream &&
-               !adata->i2ssp_play_stream && !adata->i2ssp_capture_stream)
-               rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB);
        return 0;
  }