diff options
| author | Bard Liao <bardliao@realtek.com> | 2015-04-30 18:18:42 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-05-01 17:33:47 +0100 |
| commit | 33de3d54b8b6fc53b9bace4772a70915ca96ecea (patch) | |
| tree | 03b0a58f6276dfeb8703c546b99450057ceb616e /sound/soc/codecs/rt5645.c | |
| parent | e0b5d90669139cd3e7c2592ac2eff47c57318e94 (diff) | |
| download | op-kernel-dev-33de3d54b8b6fc53b9bace4772a70915ca96ecea.zip op-kernel-dev-33de3d54b8b6fc53b9bace4772a70915ca96ecea.tar.gz | |
ASoC: rt5645: remove RT5645_I2S_BCLK_MS1 control
RT5645_I2S_BCLK_MS1 (reg 0x73 [5]) is reserverd in rt5645 and rt5650.
This function is move to TDM control. We can configure it by
snd_soc_dai_set_tdm_slot's slot_width parameter.
Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/rt5645.c')
| -rw-r--r-- | sound/soc/codecs/rt5645.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index b7b0959..5d71bfb 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -2104,9 +2104,8 @@ static int rt5645_hw_params(struct snd_pcm_substream *substream, switch (dai->id) { case RT5645_AIF1: - mask_clk = RT5645_I2S_BCLK_MS1_MASK | RT5645_I2S_PD1_MASK; - val_clk = bclk_ms << RT5645_I2S_BCLK_MS1_SFT | - pre_div << RT5645_I2S_PD1_SFT; + mask_clk = RT5645_I2S_PD1_MASK; + val_clk = pre_div << RT5645_I2S_PD1_SFT; snd_soc_update_bits(codec, RT5645_I2S1_SDP, (0x3 << dl_sft), (val_len << dl_sft)); snd_soc_update_bits(codec, RT5645_ADDA_CLK1, mask_clk, val_clk); |
