Commit d0a906d3 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus

parents ec7f9844 fc99d23f
...@@ -537,16 +537,14 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, ...@@ -537,16 +537,14 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
clk = clk_register_fixed_rate(dev, clkout_name[i], clk = clk_register_fixed_rate(dev, clkout_name[i],
parent_clk_name, 0, parent_clk_name, 0,
req_rate); req_rate);
if (!IS_ERR(clk)) { adg->clkout[i] = ERR_PTR(-ENOENT);
adg->onecell.clks = adg->clkout; if (!IS_ERR(clk))
adg->onecell.clk_num = CLKOUTMAX;
adg->clkout[i] = clk; adg->clkout[i] = clk;
of_clk_add_provider(np, of_clk_src_onecell_get,
&adg->onecell);
}
} }
adg->onecell.clks = adg->clkout;
adg->onecell.clk_num = CLKOUTMAX;
of_clk_add_provider(np, of_clk_src_onecell_get,
&adg->onecell);
} }
adg->ckr = ckr; adg->ckr = ckr;
...@@ -589,5 +587,10 @@ int rsnd_adg_probe(struct rsnd_priv *priv) ...@@ -589,5 +587,10 @@ int rsnd_adg_probe(struct rsnd_priv *priv)
void rsnd_adg_remove(struct rsnd_priv *priv) void rsnd_adg_remove(struct rsnd_priv *priv)
{ {
struct device *dev = rsnd_priv_to_dev(priv);
struct device_node *np = dev->of_node;
of_clk_del_provider(np);
rsnd_adg_clk_disable(priv); rsnd_adg_clk_disable(priv);
} }
...@@ -167,6 +167,7 @@ static int rsnd_src_hw_params(struct rsnd_mod *mod, ...@@ -167,6 +167,7 @@ static int rsnd_src_hw_params(struct rsnd_mod *mod,
* dpcm_fe_dai_hw_params() * dpcm_fe_dai_hw_params()
* dpcm_be_dai_hw_params() * dpcm_be_dai_hw_params()
*/ */
src->convert_rate = 0;
if (fe->dai_link->dynamic) { if (fe->dai_link->dynamic) {
int stream = substream->stream; int stream = substream->stream;
struct snd_soc_dpcm *dpcm; struct snd_soc_dpcm *dpcm;
...@@ -414,8 +415,6 @@ static int rsnd_src_quit(struct rsnd_mod *mod, ...@@ -414,8 +415,6 @@ static int rsnd_src_quit(struct rsnd_mod *mod,
rsnd_mod_power_off(mod); rsnd_mod_power_off(mod);
src->convert_rate = 0;
/* reset sync convert_rate */ /* reset sync convert_rate */
src->sync.val = 0; src->sync.val = 0;
......
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