From 9849edb713f605625550ca9012c1eb479462279f Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Fri, 1 Jul 2011 13:56:13 -0600 Subject: [PATCH] --- yaml --- r: 254795 b: refs/heads/master c: 713d1369789f2a2336c3431b15276c968862bdb7 h: refs/heads/master i: 254793: 3988cafb393c97a39ca077d4b2def188df49a554 254791: 5b9e518c1685d068b5bcdd99b44698be4cdd3ef6 v: v3 --- [refs] | 2 +- trunk/sound/soc/tegra/tegra_i2s.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cff0905e5a94..f34961fbc44c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e999dc50404d401150a5429b6459473a691fd1a0 +refs/heads/master: 713d1369789f2a2336c3431b15276c968862bdb7 diff --git a/trunk/sound/soc/tegra/tegra_i2s.c b/trunk/sound/soc/tegra/tegra_i2s.c index 6b817e20548c..95f03c10b4f7 100644 --- a/trunk/sound/soc/tegra/tegra_i2s.c +++ b/trunk/sound/soc/tegra/tegra_i2s.c @@ -222,12 +222,18 @@ static int tegra_i2s_hw_params(struct snd_pcm_substream *substream, if (i2sclock % (2 * srate)) reg |= TEGRA_I2S_TIMING_NON_SYM_ENABLE; + if (!i2s->clk_refs) + clk_enable(i2s->clk_i2s); + tegra_i2s_write(i2s, TEGRA_I2S_TIMING, reg); tegra_i2s_write(i2s, TEGRA_I2S_FIFO_SCR, TEGRA_I2S_FIFO_SCR_FIFO2_ATN_LVL_FOUR_SLOTS | TEGRA_I2S_FIFO_SCR_FIFO1_ATN_LVL_FOUR_SLOTS); + if (!i2s->clk_refs) + clk_disable(i2s->clk_i2s); + return 0; }