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>

diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index b7b095994a75397722ebd3460ee1da77fda2cd01..5d71bfbdacf12a0cffc515d960a4c103ded10063 100644 (file)
--- 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);

diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h
index 4473636521e506323cb23325a142a90a64665af5..fa5c56037d587a5a540d124c756bffd8d5791dd9 100644 (file)
--- a/sound/soc/codecs/rt5645.h
+++ b/sound/soc/codecs/rt5645.h
@@ -942,10 +942,6 @@
 #define RT5645_I2S2_SDI_I2S2                   (0x1 << 6)
 
 /* ADC/DAC Clock Control 1 (0x73) */
-#define RT5645_I2S_BCLK_MS1_MASK               (0x1 << 15)
-#define RT5645_I2S_BCLK_MS1_SFT                        15
-#define RT5645_I2S_BCLK_MS1_32                 (0x0 << 15)
-#define RT5645_I2S_BCLK_MS1_64                 (0x1 << 15)
 #define RT5645_I2S_PD1_MASK                    (0x7 << 12)
 #define RT5645_I2S_PD1_SFT                     12
 #define RT5645_I2S_PD1_1                       (0x0 << 12)