Merge tag 'asoc-fix-v5.13-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git...

ASoC: Fixes for v5.13

A collection of fixes that have come in since the merge window, mainly
device specific things.  The fixes to the generic cards from
Morimoto-san are handling regressions that were introduced in the merge
window on at least the Kontron sl28-var3-ads2.

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;
  }
  

diff --combined sound/soc/codecs/lpass-rx-macro.c
index b0ebfc8d180ca231d0d65bee41f9fc348de6266e,e074c7908c232ffb7476e50ad7e1cc6e2a4ce5c2..171ab7f519c0461ce61a1431ca745fee4ffa60b7
--- 1/sound/soc/codecs/lpass-rx-macro.c
--- 2/sound/soc/codecs/lpass-rx-macro.c
+++ b/sound/soc/codecs/lpass-rx-macro.c
@@@ -3549,7 -3549,7 +3549,7 @@@ static int rx_macro_probe(struct platfo
  
        /* set MCLK and NPL rates */
        clk_set_rate(rx->clks[2].clk, MCLK_FREQ);
 -      clk_set_rate(rx->clks[3].clk, MCLK_FREQ);
 +      clk_set_rate(rx->clks[3].clk, 2 * MCLK_FREQ);
  
        ret = clk_bulk_prepare_enable(RX_NUM_CLKS_MAX, rx->clks);
        if (ret)
@@@ -3579,6 -3579,7 +3579,7 @@@ static const struct of_device_id rx_mac
        { .compatible = "qcom,sm8250-lpass-rx-macro" },
        { }
  };
+ MODULE_DEVICE_TABLE(of, rx_macro_dt_match);
  
  static struct platform_driver rx_macro_driver = {
        .driver = {

diff --combined sound/soc/codecs/lpass-tx-macro.c
index acd2fbc0ca7c69b9d19cf69c59e21045a2da4a26,3d3a6e31551b7bde0b4e99998db8af20188bc98a..27a0d5defd273da7dd4f5e8316ab2617b118d1e7
--- 1/sound/soc/codecs/lpass-tx-macro.c
--- 2/sound/soc/codecs/lpass-tx-macro.c
+++ b/sound/soc/codecs/lpass-tx-macro.c
@@@ -1811,7 -1811,7 +1811,7 @@@ static int tx_macro_probe(struct platfo
  
        /* set MCLK and NPL rates */
        clk_set_rate(tx->clks[2].clk, MCLK_FREQ);
 -      clk_set_rate(tx->clks[3].clk, MCLK_FREQ);
 +      clk_set_rate(tx->clks[3].clk, 2 * MCLK_FREQ);
  
        ret = clk_bulk_prepare_enable(TX_NUM_CLKS_MAX, tx->clks);
        if (ret)
@@@ -1846,6 -1846,7 +1846,7 @@@ static const struct of_device_id tx_mac
        { .compatible = "qcom,sm8250-lpass-tx-macro" },
        { }
  };
+ MODULE_DEVICE_TABLE(of, tx_macro_dt_match);
  static struct platform_driver tx_macro_driver = {
        .driver = {
                .name = "tx_macro",