ASoC: da7210: Add support for mute and zero cross controls

This patch adds support for below set of controls,
(1) Mute controls for MIC, AUX and ADC
(2) Zero cross controls for head phone, AUX, INPGA and line out
(3) Head phone mode selection - class H or G

It also adds digital_mute() call back.

Signed-off-by: Ashish Chavan <ashish.chavan@kpitcummins.com>
Signed-off-by: David Dajun Chen <dchen@diasemi.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c
index fa0d5125e70ba9f54277d9ae328b8fe61ccac5dd..4aad01c10c5308c4b95c786b6042963ae09f3ecd 100644 (file)
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
@@ -30,6 +30,7 @@
 #define DA7210_STARTUP1                        0x03
 #define DA7210_MIC_L                   0x07
 #define DA7210_MIC_R                   0x08
+#define DA7210_AUX2                    0x0B
 #define DA7210_INMIX_L                 0x0D
 #define DA7210_INMIX_R                 0x0E
 #define DA7210_ADC_HPF                 0x0F
@@ -41,6 +42,7 @@
 #define DA7210_DAC_L                   0x15
 #define DA7210_DAC_R                   0x16
 #define DA7210_DAC_SEL                 0x17
+#define DA7210_SOFTMUTE                        0x18
 #define DA7210_DAC_EQ1_2               0x19
 #define DA7210_DAC_EQ3_4               0x1A
 #define DA7210_DAC_EQ5                 0x1B
@@ -49,6 +51,7 @@
 #define DA7210_HP_L_VOL                        0x21
 #define DA7210_HP_R_VOL                        0x22
 #define DA7210_HP_CFG                  0x23
+#define DA7210_ZERO_CROSS              0x24
 #define DA7210_DAI_SRC_SEL             0x25
 #define DA7210_DAI_CFG1                        0x26
 #define DA7210_DAI_CFG3                        0x28
@@ -144,6 +147,9 @@
 #define DA7210_PLL_FS_96000            (0xF << 0)
 #define DA7210_PLL_EN                  (0x1 << 7)
 
+/* SOFTMUTE bit fields */
+#define DA7210_RAMP_EN                 (1 << 6)
+
 #define DA7210_VERSION "0.0.1"
 
 /*
@@ -189,6 +195,13 @@ static const struct soc_enum da7210_dac_vf_cutoff =
 static const struct soc_enum da7210_adc_vf_cutoff =
        SOC_ENUM_SINGLE(DA7210_ADC_HPF, 4, 8, da7210_vf_cutoff_txt);
 
+static const char *da7210_hp_mode_txt[] = {
+       "Class H", "Class G"
+};
+
+static const struct soc_enum da7210_hp_mode_sel =
+       SOC_ENUM_SINGLE(DA7210_HP_CFG, 0, 2, da7210_hp_mode_txt);
+
 static const struct snd_kcontrol_new da7210_snd_controls[] = {
 
        SOC_DOUBLE_R_TLV("HeadPhone Playback Volume",
@@ -232,6 +245,21 @@ static const struct snd_kcontrol_new da7210_snd_controls[] = {
        SOC_ENUM("ADC HPF Cutoff", da7210_adc_hpf_cutoff),
        SOC_SINGLE("ADC Voice Mode Switch", DA7210_ADC_HPF, 7, 1, 0),
        SOC_ENUM("ADC Voice Cutoff", da7210_adc_vf_cutoff),
+
+       /* Mute controls */
+       SOC_DOUBLE_R("Mic Capture Switch", DA7210_MIC_L, DA7210_MIC_R, 3, 1, 0),
+       SOC_SINGLE("Aux2 Capture Switch", DA7210_AUX2, 2, 1, 0),
+       SOC_DOUBLE("ADC Capture Switch", DA7210_ADC, 2, 6, 1, 0),
+       SOC_SINGLE("Digital Soft Mute Switch", DA7210_SOFTMUTE, 7, 1, 0),
+       SOC_SINGLE("Digital Soft Mute Rate", DA7210_SOFTMUTE, 0, 0x7, 0),
+
+       /* Zero cross controls */
+       SOC_DOUBLE("Aux1 ZC Switch", DA7210_ZERO_CROSS, 0, 1, 1, 0),
+       SOC_DOUBLE("In PGA ZC Switch", DA7210_ZERO_CROSS, 2, 3, 1, 0),
+       SOC_DOUBLE("Lineout ZC Switch", DA7210_ZERO_CROSS, 4, 5, 1, 0),
+       SOC_DOUBLE("Headphone ZC Switch", DA7210_ZERO_CROSS, 6, 7, 1, 0),
+
+       SOC_ENUM("Headphone Class", da7210_hp_mode_sel),
 };
 
 /* Codec private data */
@@ -448,6 +476,18 @@ static int da7210_set_dai_fmt(struct snd_soc_dai *codec_dai, u32 fmt)
        return 0;
 }
 
+static int da7210_mute(struct snd_soc_dai *dai, int mute)
+{
+       struct snd_soc_codec *codec = dai->codec;
+       u8 mute_reg = snd_soc_read(codec, DA7210_DAC_HPF) & 0xFB;
+
+       if (mute)
+               snd_soc_write(codec, DA7210_DAC_HPF, mute_reg | 0x4);
+       else
+               snd_soc_write(codec, DA7210_DAC_HPF, mute_reg);
+       return 0;
+}
+
 #define DA7210_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
                        SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
 
@@ -456,6 +496,7 @@ static struct snd_soc_dai_ops da7210_dai_ops = {
        .startup        = da7210_startup,
        .hw_params      = da7210_hw_params,
        .set_fmt        = da7210_set_dai_fmt,
+       .digital_mute   = da7210_mute,
 };
 
 static struct snd_soc_dai_driver da7210_dai = {
@@ -545,6 +586,9 @@ static int da7210_probe(struct snd_soc_codec *codec)
                     DA7210_HP_2CAP_MODE | DA7210_HP_SENSE_EN |
                     DA7210_HP_L_EN | DA7210_HP_MODE | DA7210_HP_R_EN);
 
+       /* Enable ramp mode for DAC gain update */
+       snd_soc_write(codec, DA7210_SOFTMUTE, DA7210_RAMP_EN);
+
        /* Diable PLL and bypass it */
        snd_soc_write(codec, DA7210_PLL, DA7210_PLL_FS_48000);