From: Mark Brown <broonie@kernel.org>
Date: Fri, 6 Aug 2021 00:46:24 +0000 (+0100)
Subject: Merge some cs42l42 patches into asoc-5.15
X-Git-Tag: accepted/tizen/unified/20230118.172025~6151^2~1^2~84
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ddaa1ed52c5da64fe9adf1d5ea6202cda3a53eea;p=platform%2Fkernel%2Flinux-rpi.git

Merge some cs42l42 patches into asoc-5.15
---

ddaa1ed52c5da64fe9adf1d5ea6202cda3a53eea
diff --cc sound/soc/ti/j721e-evm.c
index 7d4e2e2,265bbc5..9347f98
--- a/sound/soc/ti/j721e-evm.c
+++ b/sound/soc/ti/j721e-evm.c
@@@ -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);