summaryrefslogtreecommitdiff
path: root/sound/soc/tegra/tegra30_i2s.c
diff options
context:
space:
mode:
authorScottPeterson <speterson@nvidia.com>2012-01-17 17:32:11 -0800
committerVarun Colbert <vcolbert@nvidia.com>2012-01-30 13:28:18 -0800
commit2e3c724c167ec5da8b1ed5ab07cda55232ecdf13 (patch)
treed82c4c6da45dd46de1aa0c75393869470fe033e3 /sound/soc/tegra/tegra30_i2s.c
parent6814bf677b18c10cee192e813d3d468b01229a25 (diff)
asoc:tegra: Support I2S slave mode
Support I2S slave mode. Disable pll_p_out1 and pll_a to reduce power when in slave mode. Slave mode disabled by default. Reviewed-on: http://git-master/r/76046 Change-Id: I873a11d54f1e037d99c86ff4cec06ee83064902a Signed-off-by: ScottPeterson <speterson@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/77765 Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'sound/soc/tegra/tegra30_i2s.c')
-rw-r--r--sound/soc/tegra/tegra30_i2s.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c
index c1de635765a5..9a0ed5a762ed 100644
--- a/sound/soc/tegra/tegra30_i2s.c
+++ b/sound/soc/tegra/tegra30_i2s.c
@@ -303,13 +303,11 @@ static int tegra30_i2s_hw_params(struct snd_pcm_substream *substream,
srate = params_rate(params);
if (i2s->reg_ctrl & TEGRA30_I2S_CTRL_MASTER_ENABLE) {
- /* Final "* 2" required by Tegra hardware */
- i2sclock = srate * params_channels(params) * sample_size * 2;
+ i2sclock = srate * params_channels(params) * sample_size;
- /* Additional "* 2" is needed for FSYNC mode */
+ /* Additional "* 4" is needed for FSYNC mode */
if (i2s->reg_ctrl & TEGRA30_I2S_CTRL_FRAME_FORMAT_FSYNC)
- i2sclock *= 2;
-
+ i2sclock *= 4;
ret = clk_set_parent(i2s->clk_i2s, i2s->clk_pll_a_out0);
if (ret) {
dev_err(dev, "Can't set parent of I2S clock\n");