From: Mark Brown <broonie@kernel.org>
Date: Fri, 16 Jun 2023 13:55:20 +0000 (+0100)
Subject: ASoC: Merge fixes due to dependencies
X-Git-Tag: v6.6.7~1940^2~32^2~75
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a32b4b9a6229233de70cec28fb5a87fabac2c41;p=platform%2Fkernel%2Flinux-starfive.git

ASoC: Merge fixes due to dependencies

So we can apply the tlv320aic3xxx DT conversion.
---

1a32b4b9a6229233de70cec28fb5a87fabac2c41
diff --cc sound/soc/mediatek/mt8188/mt8188-afe-clk.h
index 904505d,a4203a8..ec53c17
--- a/sound/soc/mediatek/mt8188/mt8188-afe-clk.h
+++ b/sound/soc/mediatek/mt8188/mt8188-afe-clk.h
@@@ -108,10 -99,7 +108,9 @@@ struct mtk_base_afe
  int mt8188_afe_get_mclk_source_clk_id(int sel);
  int mt8188_afe_get_mclk_source_rate(struct mtk_base_afe *afe, int apll);
  int mt8188_afe_get_default_mclk_source_by_rate(int rate);
 +int mt8188_get_apll_by_rate(struct mtk_base_afe *afe, int rate);
 +int mt8188_get_apll_by_name(struct mtk_base_afe *afe, const char *name);
  int mt8188_afe_init_clock(struct mtk_base_afe *afe);
- void mt8188_afe_deinit_clock(void *priv);
  int mt8188_afe_enable_clk(struct mtk_base_afe *afe, struct clk *clk);
  void mt8188_afe_disable_clk(struct mtk_base_afe *afe, struct clk *clk);
  int mt8188_afe_set_clk_rate(struct mtk_base_afe *afe, struct clk *clk,