Commit 9a5e12be authored by Mark Brown's avatar Mark Brown

Merge series "ASoC: Revert clk_hw_get_clk() cleanup" from Jerome Brunet <jbrunet@baylibre.com>:

There is problem with clk_hw_get_hw(). Using it pins the clock provider to
itself, making it impossible to remove the related module.

Revert the two commits using this function until this gets sorted out.

Jerome Brunet (2):
  ASoC: stm32: do not request a new clock consummer reference
  ASoC: da7219: do not request a new clock consummer reference

 sound/soc/codecs/da7219.c     | 5 +----
 sound/soc/stm/stm32_sai_sub.c | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

--
2.31.1
parents 6879e8e7 97c73365
...@@ -2181,10 +2181,7 @@ static int da7219_register_dai_clks(struct snd_soc_component *component) ...@@ -2181,10 +2181,7 @@ static int da7219_register_dai_clks(struct snd_soc_component *component)
ret); ret);
goto err; goto err;
} }
da7219->dai_clks[i] = dai_clk_hw->clk;
da7219->dai_clks[i] = devm_clk_hw_get_clk(dev, dai_clk_hw, NULL);
if (IS_ERR(da7219->dai_clks[i]))
return PTR_ERR(da7219->dai_clks[i]);
/* For DT setup onecell data, otherwise create lookup */ /* For DT setup onecell data, otherwise create lookup */
if (np) { if (np) {
......
...@@ -484,10 +484,7 @@ static int stm32_sai_add_mclk_provider(struct stm32_sai_sub_data *sai) ...@@ -484,10 +484,7 @@ static int stm32_sai_add_mclk_provider(struct stm32_sai_sub_data *sai)
dev_err(dev, "mclk register returned %d\n", ret); dev_err(dev, "mclk register returned %d\n", ret);
return ret; return ret;
} }
sai->sai_mclk = hw->clk;
sai->sai_mclk = devm_clk_hw_get_clk(dev, hw, NULL);
if (IS_ERR(sai->sai_mclk))
return PTR_ERR(sai->sai_mclk);
/* register mclk provider */ /* register mclk provider */
return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, hw); return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, hw);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment