diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-07-05 08:20:00 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-07-05 08:20:00 +0200 |
| commit | 8d9afa08fe831ae521bf11a125b347bb0b578526 (patch) | |
| tree | 69f8cf880bcd4941760aefe2569f465e6ab75bf2 /sound/soc/tegra/tegra_i2s.c | |
| parent | Merge branch 'for-3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/a... (diff) | |
| parent | ASoC: Ensure we delay long enough for WM8994 FLL to lock when starting (diff) | |
| download | linux-8d9afa08fe831ae521bf11a125b347bb0b578526.tar.xz linux-8d9afa08fe831ae521bf11a125b347bb0b578526.zip | |
Merge branch 'for-3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
Diffstat (limited to 'sound/soc/tegra/tegra_i2s.c')
| -rw-r--r-- | sound/soc/tegra/tegra_i2s.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/tegra/tegra_i2s.c b/sound/soc/tegra/tegra_i2s.c index 6b817e20548c..95f03c10b4f7 100644 --- a/sound/soc/tegra/tegra_i2s.c +++ b/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; } |