ASoC: rt5645: Add TDM support for rt5650

rt5650 and rt5645 use different register bits for TDM configuration.
This patch modifies rt5645_set_tdm_slot to support both codecs.

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 c9a4c5be083b454230c1a0d9bf0424fd8c279056..b79347688873ba864ffcc9cb9ca4f52a8060abdf 100644 (file)
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -2285,23 +2285,42 @@ static int rt5645_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
                        unsigned int rx_mask, int slots, int slot_width)
 {
        struct snd_soc_codec *codec = dai->codec;
-       unsigned int val = 0;
+       struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
+       unsigned int i_slot_sft, o_slot_sft, i_width_sht, o_width_sht, en_sft;
+       unsigned int mask, val = 0;
 
+       switch (rt5645->codec_type) {
+       case CODEC_TYPE_RT5650:
+               en_sft = 15;
+               i_slot_sft = 10;
+               o_slot_sft = 8;
+               i_width_sht = 6;
+               o_width_sht = 4;
+               mask = 0x8ff0;
+               break;
+       default:
+               en_sft = 14;
+               i_slot_sft = o_slot_sft = 12;
+               i_width_sht = o_width_sht = 10;
+               mask = 0x7c00;
+               break;
+       }
        if (rx_mask || tx_mask) {
-               val |= (1 << 14);
-               snd_soc_update_bits(codec, RT5645_BASS_BACK,
-                       RT5645_G_BB_BST_MASK, RT5645_G_BB_BST_25DB);
+               val |= (1 << en_sft);
+               if (rt5645->codec_type == CODEC_TYPE_RT5645)
+                       snd_soc_update_bits(codec, RT5645_BASS_BACK,
+                               RT5645_G_BB_BST_MASK, RT5645_G_BB_BST_25DB);
        }
 
        switch (slots) {
        case 4:
-               val |= (1 << 12);
+               val |= (1 << i_slot_sft) | (1 << o_slot_sft);
                break;
        case 6:
-               val |= (2 << 12);
+               val |= (2 << i_slot_sft) | (2 << o_slot_sft);
                break;
        case 8:
-               val |= (3 << 12);
+               val |= (3 << i_slot_sft) | (3 << o_slot_sft);
                break;
        case 2:
        default:
@@ -2310,20 +2329,20 @@ static int rt5645_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
 
        switch (slot_width) {
        case 20:
-               val |= (1 << 10);
+               val |= (1 << i_width_sht) | (1 << o_width_sht);
                break;
        case 24:
-               val |= (2 << 10);
+               val |= (2 << i_width_sht) | (2 << o_width_sht);
                break;
        case 32:
-               val |= (3 << 10);
+               val |= (3 << i_width_sht) | (3 << o_width_sht);
                break;
        case 16:
        default:
                break;
        }
 
-       snd_soc_update_bits(codec, RT5645_TDM_CTRL_1, 0x7c00, val);
+       snd_soc_update_bits(codec, RT5645_TDM_CTRL_1, mask, val);
 
        return 0;
 }