Commit e3c6de48 authored Aug 02, 2017 by Kuninori Morimoto Committed by Mark Brown Aug 02, 2017

ASoC: rcar: unregister fixed rate on ADG



ADG is registering fixed rate clock for audio_clkout, but it had not
been unregister clock when removing.

Salvator-X board is using ak4613 driver now, and it supports
hw_constraints from commit 907cd880 ("ASoC: ak4613: add
hw_constraint rule for Sampling Rate").
And this calculation is using input clk. This ak4613 input clock is
ADG clkout on Salvator-X.

Because ADG had not been unregister clkout when unbinding, it receives
fixed rate clk register error when re-binding.
Thus, ak4613 can't get correct input clock, and hw_constraints will be
failed after re-binding.
This means Salvator-X board can't use sound after unbind/bind.

This patch solves this issue.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 5771a8c0

sound/soc/sh/rcar/adg.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -610,6 +610,13 @@ void rsnd_adg_remove(struct rsnd_priv *priv)
		{
		struct device *dev = rsnd_priv_to_dev(priv);
		struct device_node *np = dev->of_node;
		struct rsnd_adg *adg = priv->adg;
		struct clk *clk;
		int i;

		for_each_rsnd_clkout(clk, adg, i)
		if (adg->clkout[i])
		clk_unregister_fixed_rate(adg->clkout[i]);

		of_clk_del_provider(np);

Admin message