Merge some cs42l42 patches into asoc-5.15
authorMark Brown <broonie@kernel.org>
Fri, 6 Aug 2021 00:46:24 +0000 (01:46 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 6 Aug 2021 00:46:24 +0000 (01:46 +0100)
15 files changed:
1  2 
MAINTAINERS
sound/soc/amd/acp-da7219-max98357a.c
sound/soc/amd/acp-pcm-dma.c
sound/soc/amd/raven/acp3x-pcm-dma.c
sound/soc/amd/renoir/acp3x-pdm-dma.c
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile
sound/soc/codecs/cs42l42.h
sound/soc/codecs/rt5682.c
sound/soc/codecs/tlv320aic32x4.c
sound/soc/codecs/wcd938x.c
sound/soc/codecs/wm_adsp.c
sound/soc/soc-pcm.c
sound/soc/sof/intel/hda.c
sound/soc/ti/j721e-evm.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -200,10 -197,11 +200,10 @@@ static int j721e_configure_refclk(struc
                return ret;
        }
  
-       if (priv->hsdiv_rates[domain->parent_clk_id] != scki) {
+       if (domain->parent_clk_id == -1 || priv->hsdiv_rates[domain->parent_clk_id] != scki) {
                dev_dbg(priv->dev,
 -                      "%s configuration for %u Hz: %s, %dxFS (SCKI: %u Hz)\n",
 -                      audio_domain == J721E_AUDIO_DOMAIN_CPB ? "CPB" : "IVI",
 -                      rate,
 +                      "domain%u configuration for %u Hz: %s, %dxFS (SCKI: %u Hz)\n",
 +                      audio_domain, rate,
                        clk_id == J721E_CLK_PARENT_48000 ? "PLL4" : "PLL15",
                        ratios_for_pcm3168a[i], scki);