Skip to content

Commit ff5d18c

Browse files
Sowjanya Komatinenithierryreding
authored andcommitted
ASoC: tegra: Enable audio mclk during tegra_asoc_utils_init()
Tegra PMC clock clk_out_1 is dedicated for audio mclk from Tegra30 through Tegra210 and currently Tegra clock driver keeps the audio mclk enabled. With the move of PMC clocks from clock driver into pmc driver, audio mclk enable from clock driver is removed and this should be taken care of by the audio driver. tegra_asoc_utils_init() calls tegra_asoc_utils_set_rate() and audio mclk rate configuration is not needed during init and the rate is actually set during the ->hw_params() callback. So, this patch removes tegra_asoc_utils_set_rate() call and just leaves the audio mclk enabled. Signed-off-by: Sowjanya Komatineni <[email protected]> Tested-by: Dmitry Osipenko <[email protected]> Reviewed-by: Dmitry Osipenko <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
1 parent 1e4e0bf commit ff5d18c

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

sound/soc/tegra/tegra_asoc_utils.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,16 @@ int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data,
205205
data->clk_cdev1 = clk_out_1;
206206
}
207207

208-
ret = tegra_asoc_utils_set_rate(data, 44100, 256 * 44100);
209-
if (ret)
208+
/*
209+
* FIXME: There is some unknown dependency between audio mclk disable
210+
* and suspend-resume functionality on Tegra30, although audio mclk is
211+
* only needed for audio.
212+
*/
213+
ret = clk_prepare_enable(data->clk_cdev1);
214+
if (ret) {
215+
dev_err(data->dev, "Can't enable cdev1: %d\n", ret);
210216
return ret;
217+
}
211218

212219
return 0;
213220
}

0 commit comments

Comments
 (0)