asoc: tegra: i2s: fix DSP mode frame sync width
Dara Ramesh [Thu, 3 Jan 2013 11:50:23 +0000 (16:50 +0530)]
set default fsync width (i.e short fsync) for
both DSP_A and DSP_B modes.

Change-Id: I519743d4332220b7f686b09da87a096508827990
Signed-off-by: Dara Ramesh <dramesh@nvidia.com>
Reviewed-on: http://git-master/r/188278
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Rahul Mittal <rmittal@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

sound/soc/tegra/tegra30_i2s.c

index 09c56dc..9ad1bb6 100644 (file)
@@ -554,8 +554,6 @@ static int tegra30_i2s_hw_params(struct snd_pcm_substream *substream,
                        bitcnt = (i2sclock / srate) - 1;
                        sym_bitclk = !(i2sclock % srate);
 #ifndef CONFIG_ARCH_TEGRA_3x_SOC
-                       i2s->reg_ch_ctrl |= (1 <<
-                               TEGRA30_I2S_CH_CTRL_FSYNC_WIDTH_SHIFT);
                        val = 0;
                        for (i = 0; i < params_channels(params); i++)
                                val |= (1 << i);
@@ -1048,18 +1046,10 @@ static int configure_baseband_i2s(struct tegra30_i2s  *i2s, int is_i2smaster,
                i2s->reg_ctrl |= TEGRA30_I2S_CTRL_MASTER_ENABLE;
 
        if (i2s_mode == TEGRA_DAIFMT_DSP_A) {
-#ifndef CONFIG_ARCH_TEGRA_3x_SOC
-               i2s->reg_ch_ctrl |= (1 <<
-                       TEGRA30_I2S_CH_CTRL_FSYNC_WIDTH_SHIFT);
-#endif
                i2s->reg_ctrl |= TEGRA30_I2S_CTRL_FRAME_FORMAT_FSYNC;
                i2s->reg_ctrl |= TEGRA30_I2S_CTRL_LRCK_R_LOW;
                i2s->reg_ch_ctrl |= TEGRA30_I2S_CH_CTRL_EGDE_CTRL_NEG_EDGE;
        } else if (i2s_mode == TEGRA_DAIFMT_DSP_B) {
-#ifndef CONFIG_ARCH_TEGRA_3x_SOC
-               i2s->reg_ch_ctrl |= (1 <<
-                       TEGRA30_I2S_CH_CTRL_FSYNC_WIDTH_SHIFT);
-#endif
                i2s->reg_ctrl |= TEGRA30_I2S_CTRL_FRAME_FORMAT_FSYNC;
                i2s->reg_ctrl |= TEGRA30_I2S_CTRL_LRCK_R_LOW;
                i2s->reg_ch_ctrl |= TEGRA30_I2S_CH_CTRL_EGDE_CTRL_POS_EDGE;