1 files changed, 213 insertions, 57 deletions

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index b393f9fac97a..e5372675123d 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -107,6 +107,7 @@ static int wm8994_volatile(struct snd_soc_codec *codec, unsigned int reg)
         case WM8994_LDO_2:
         case WM8958_DSP2_EXECCONTROL:
         case WM8958_MIC_DETECT_3:
+        case WM8994_DC_SERVO_4E:
                 return 1;
         default:
                 return 0;
@@ -281,6 +282,7 @@ static const DECLARE_TLV_DB_SCALE(digital_tlv, -7200, 75, 1);
 static const DECLARE_TLV_DB_SCALE(st_tlv, -3600, 300, 0);
 static const DECLARE_TLV_DB_SCALE(wm8994_3d_tlv, -1600, 183, 0);
 static const DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0);
+static const DECLARE_TLV_DB_SCALE(ng_tlv, -10200, 600, 0);
 
 #define WM8994_DRC_SWITCH(xname, reg, shift) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
@@ -660,8 +662,45 @@ SOC_SINGLE_TLV("AIF2 EQ5 Volume", WM8994_AIF2_EQ_GAINS_2, 6, 31, 0,
                eq_tlv),
 };
 
+static const char *wm8958_ng_text[] = {
+        "30ms", "125ms", "250ms", "500ms",
+};
+
+static const struct soc_enum wm8958_aif1dac1_ng_hold =
+        SOC_ENUM_SINGLE(WM8958_AIF1_DAC1_NOISE_GATE,
+                        WM8958_AIF1DAC1_NG_THR_SHIFT, 4, wm8958_ng_text);
+
+static const struct soc_enum wm8958_aif1dac2_ng_hold =
+        SOC_ENUM_SINGLE(WM8958_AIF1_DAC2_NOISE_GATE,
+                        WM8958_AIF1DAC2_NG_THR_SHIFT, 4, wm8958_ng_text);
+
+static const struct soc_enum wm8958_aif2dac_ng_hold =
+        SOC_ENUM_SINGLE(WM8958_AIF2_DAC_NOISE_GATE,
+                        WM8958_AIF2DAC_NG_THR_SHIFT, 4, wm8958_ng_text);
+
 static const struct snd_kcontrol_new wm8958_snd_controls[] = {
 SOC_SINGLE_TLV("AIF3 Boost Volume", WM8958_AIF3_CONTROL_2, 10, 3, 0, aif_tlv),
+
+SOC_SINGLE("AIF1DAC1 Noise Gate Switch", WM8958_AIF1_DAC1_NOISE_GATE,
+           WM8958_AIF1DAC1_NG_ENA_SHIFT, 1, 0),
+SOC_ENUM("AIF1DAC1 Noise Gate Hold Time", wm8958_aif1dac1_ng_hold),
+SOC_SINGLE_TLV("AIF1DAC1 Noise Gate Threshold Volume",
+               WM8958_AIF1_DAC1_NOISE_GATE, WM8958_AIF1DAC1_NG_THR_SHIFT,
+               7, 1, ng_tlv),
+
+SOC_SINGLE("AIF1DAC2 Noise Gate Switch", WM8958_AIF1_DAC2_NOISE_GATE,
+           WM8958_AIF1DAC2_NG_ENA_SHIFT, 1, 0),
+SOC_ENUM("AIF1DAC2 Noise Gate Hold Time", wm8958_aif1dac2_ng_hold),
+SOC_SINGLE_TLV("AIF1DAC2 Noise Gate Threshold Volume",
+               WM8958_AIF1_DAC2_NOISE_GATE, WM8958_AIF1DAC2_NG_THR_SHIFT,
+               7, 1, ng_tlv),
+
+SOC_SINGLE("AIF2DAC Noise Gate Switch", WM8958_AIF2_DAC_NOISE_GATE,
+           WM8958_AIF2DAC_NG_ENA_SHIFT, 1, 0),
+SOC_ENUM("AIF2DAC Noise Gate Hold Time", wm8958_aif2dac_ng_hold),
+SOC_SINGLE_TLV("AIF2DAC Noise Gate Threshold Volume",
+               WM8958_AIF2_DAC_NOISE_GATE, WM8958_AIF2DAC_NG_THR_SHIFT,
+               7, 1, ng_tlv),
 };
 
 static int clk_sys_event(struct snd_soc_dapm_widget *w,
@@ -681,6 +720,97 @@ static int clk_sys_event(struct snd_soc_dapm_widget *w,
         return 0;
 }
 
+static void vmid_reference(struct snd_soc_codec *codec)
+{
+        struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
+
+        wm8994->vmid_refcount++;
+
+        dev_dbg(codec->dev, "Referencing VMID, refcount is now %d\n",
+                wm8994->vmid_refcount);
+
+        if (wm8994->vmid_refcount == 1) {
+                /* Startup bias, VMID ramp & buffer */
+                snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
+                                    WM8994_STARTUP_BIAS_ENA |
+                                    WM8994_VMID_BUF_ENA |
+                                    WM8994_VMID_RAMP_MASK,
+                                    WM8994_STARTUP_BIAS_ENA |
+                                    WM8994_VMID_BUF_ENA |
+                                    (0x11 << WM8994_VMID_RAMP_SHIFT));
+
+                /* Main bias enable, VMID=2x40k */
+                snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1,
+                                    WM8994_BIAS_ENA |
+                                    WM8994_VMID_SEL_MASK,
+                                    WM8994_BIAS_ENA | 0x2);
+
+                msleep(20);
+        }
+}
+
+static void vmid_dereference(struct snd_soc_codec *codec)
+{
+        struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
+
+        wm8994->vmid_refcount--;
+
+        dev_dbg(codec->dev, "Dereferencing VMID, refcount is now %d\n",
+                wm8994->vmid_refcount);
+
+        if (wm8994->vmid_refcount == 0) {
+                /* Switch over to startup biases */
+                snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
+                                    WM8994_BIAS_SRC |
+                                    WM8994_STARTUP_BIAS_ENA |
+                                    WM8994_VMID_BUF_ENA |
+                                    WM8994_VMID_RAMP_MASK,
+                                    WM8994_BIAS_SRC |
+                                    WM8994_STARTUP_BIAS_ENA |
+                                    WM8994_VMID_BUF_ENA |
+                                    (1 << WM8994_VMID_RAMP_SHIFT));
+
+                /* Disable main biases */
+                snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1,
+                                    WM8994_BIAS_ENA |
+                                    WM8994_VMID_SEL_MASK, 0);
+
+                /* Discharge line */
+                snd_soc_update_bits(codec, WM8994_ANTIPOP_1,
+                                    WM8994_LINEOUT1_DISCH |
+                                    WM8994_LINEOUT2_DISCH,
+                                    WM8994_LINEOUT1_DISCH |
+                                    WM8994_LINEOUT2_DISCH);
+
+                msleep(5);
+
+                /* Switch off startup biases */
+                snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
+                                    WM8994_BIAS_SRC |
+                                    WM8994_STARTUP_BIAS_ENA |
+                                    WM8994_VMID_BUF_ENA |
+                                    WM8994_VMID_RAMP_MASK, 0);
+        }
+}
+
+static int vmid_event(struct snd_soc_dapm_widget *w,
+                      struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                vmid_reference(codec);
+                break;
+
+        case SND_SOC_DAPM_POST_PMD:
+                vmid_dereference(codec);
+                break;
+        }
+
+        return 0;
+}
+
 static void wm8994_update_class_w(struct snd_soc_codec *codec)
 {
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
@@ -1208,6 +1338,8 @@ SND_SOC_DAPM_INPUT("Clock"),
 
 SND_SOC_DAPM_SUPPLY_S("MICBIAS Supply", 1, SND_SOC_NOPM, 0, 0, micbias_ev,
                       SND_SOC_DAPM_PRE_PMU),
+SND_SOC_DAPM_SUPPLY("VMID", SND_SOC_NOPM, 0, 0, vmid_event,
+                    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 
 SND_SOC_DAPM_SUPPLY("CLK_SYS", SND_SOC_NOPM, 0, 0, clk_sys_event,
                     SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
@@ -1525,6 +1657,8 @@ static const struct snd_soc_dapm_route wm8994_revd_intercon[] = {
 static const struct snd_soc_dapm_route wm8994_intercon[] = {
         { "AIF2DACL", NULL, "AIF2DAC Mux" },
         { "AIF2DACR", NULL, "AIF2DAC Mux" },
+        { "MICBIAS1", NULL, "VMID" },
+        { "MICBIAS2", NULL, "VMID" },
 };
 
 static const struct snd_soc_dapm_route wm8958_intercon[] = {
@@ -1629,10 +1763,12 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src,
                           unsigned int freq_in, unsigned int freq_out)
 {
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
+        struct wm8994 *control = codec->control_data;
         int reg_offset, ret;
         struct fll_div fll;
         u16 reg, aif1, aif2;
         unsigned long timeout;
+        bool was_enabled;
 
         aif1 = snd_soc_read(codec, WM8994_AIF1_CLOCKING_1)
                 & WM8994_AIF1CLK_ENA;
@@ -1653,6 +1789,9 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src,
                 return -EINVAL;
         }
 
+        reg = snd_soc_read(codec, WM8994_FLL1_CONTROL_1 + reg_offset);
+        was_enabled = reg & WM8994_FLL1_ENA;
+
         switch (src) {
         case 0:
                 /* Allow no source specification when stopping */
@@ -1719,6 +1858,21 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src,
 
         /* Enable (with fractional mode if required) */
         if (freq_out) {
+                /* Enable VMID if we need it */
+                if (!was_enabled) {
+                        switch (control->type) {
+                        case WM8994:
+                                vmid_reference(codec);
+                                break;
+                        case WM8958:
+                                if (wm8994->revision < 1)
+                                        vmid_reference(codec);
+                                break;
+                        default:
+                                break;
+                        }
+                }
+
                 if (fll.k)
                         reg = WM8994_FLL1_ENA | WM8994_FLL1_FRAC;
                 else
@@ -1736,6 +1890,20 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src,
                 } else {
                         msleep(5);
                 }
+        } else {
+                if (was_enabled) {
+                        switch (control->type) {
+                        case WM8994:
+                                vmid_dereference(codec);
+                                break;
+                        case WM8958:
+                                if (wm8994->revision < 1)
+                                        vmid_dereference(codec);
+                                break;
+                        default:
+                                break;
+                        }
+                }
         }
 
         wm8994->fll[id].in = freq_in;
@@ -1852,9 +2020,6 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec,
                 break;
 
         case SND_SOC_BIAS_PREPARE:
-                /* VMID=2x40k */
-                snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1,
-                                    WM8994_VMID_SEL_MASK, 0x2);
                 break;
 
         case SND_SOC_BIAS_STANDBY:
@@ -1896,65 +2061,13 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec,
                                             WM8994_LINEOUT2_DISCH,
                                             WM8994_LINEOUT1_DISCH |
                                             WM8994_LINEOUT2_DISCH);
-
-                        /* Startup bias, VMID ramp & buffer */
-                        snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
-                                            WM8994_STARTUP_BIAS_ENA |
-                                            WM8994_VMID_BUF_ENA |
-                                            WM8994_VMID_RAMP_MASK,
-                                            WM8994_STARTUP_BIAS_ENA |
-                                            WM8994_VMID_BUF_ENA |
-                                            (0x11 << WM8994_VMID_RAMP_SHIFT));
-
-                        /* Main bias enable, VMID=2x40k */
-                        snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1,
-                                            WM8994_BIAS_ENA |
-                                            WM8994_VMID_SEL_MASK,
-                                            WM8994_BIAS_ENA | 0x2);
-
-                        msleep(20);
                 }
 
-                /* VMID=2x500k */
-                snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1,
-                                    WM8994_VMID_SEL_MASK, 0x4);
 
                 break;
 
         case SND_SOC_BIAS_OFF:
                 if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY) {
-                        /* Switch over to startup biases */
-                        snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
-                                            WM8994_BIAS_SRC |
-                                            WM8994_STARTUP_BIAS_ENA |
-                                            WM8994_VMID_BUF_ENA |
-                                            WM8994_VMID_RAMP_MASK,
-                                            WM8994_BIAS_SRC |
-                                            WM8994_STARTUP_BIAS_ENA |
-                                            WM8994_VMID_BUF_ENA |
-                                            (1 << WM8994_VMID_RAMP_SHIFT));
-
-                        /* Disable main biases */
-                        snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1,
-                                            WM8994_BIAS_ENA |
-                                            WM8994_VMID_SEL_MASK, 0);
-
-                        /* Discharge line */
-                        snd_soc_update_bits(codec, WM8994_ANTIPOP_1,
-                                            WM8994_LINEOUT1_DISCH |
-                                            WM8994_LINEOUT2_DISCH,
-                                            WM8994_LINEOUT1_DISCH |
-                                            WM8994_LINEOUT2_DISCH);
-
-                        msleep(5);
-
-                        /* Switch off startup biases */
-                        snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
-                                            WM8994_BIAS_SRC |
-                                            WM8994_STARTUP_BIAS_ENA |
-                                            WM8994_VMID_BUF_ENA |
-                                            WM8994_VMID_RAMP_MASK, 0);
-
                         wm8994->cur_fw = NULL;
 
                         pm_runtime_put(codec->dev);
@@ -2384,6 +2497,21 @@ static int wm8994_set_tristate(struct snd_soc_dai *codec_dai, int tristate)
         return snd_soc_update_bits(codec, reg, mask, val);
 }
 
+static int wm8994_aif2_probe(struct snd_soc_dai *dai)
+{
+        struct snd_soc_codec *codec = dai->codec;
+
+        /* Disable the pulls on the AIF if we're using it to save power. */
+        snd_soc_update_bits(codec, WM8994_GPIO_3,
+                            WM8994_GPN_PU | WM8994_GPN_PD, 0);
+        snd_soc_update_bits(codec, WM8994_GPIO_4,
+                            WM8994_GPN_PU | WM8994_GPN_PD, 0);
+        snd_soc_update_bits(codec, WM8994_GPIO_5,
+                            WM8994_GPN_PU | WM8994_GPN_PD, 0);
+
+        return 0;
+}
+
 #define WM8994_RATES SNDRV_PCM_RATE_8000_96000
 
 #define WM8994_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
@@ -2451,6 +2579,7 @@ static struct snd_soc_dai_driver wm8994_dai[] = {
                         .rates = WM8994_RATES,
                         .formats = WM8994_FORMATS,
                 },
+                .probe = wm8994_aif2_probe,
                 .ops = &wm8994_aif2_dai_ops,
         },
         {
@@ -2916,6 +3045,24 @@ static irqreturn_t wm8994_fifo_error(int irq, void *data)
         return IRQ_HANDLED;
 }
 
+static irqreturn_t wm8994_temp_warn(int irq, void *data)
+{
+        struct snd_soc_codec *codec = data;
+
+        dev_err(codec->dev, "Thermal warning\n");
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t wm8994_temp_shut(int irq, void *data)
+{
+        struct snd_soc_codec *codec = data;
+
+        dev_crit(codec->dev, "Thermal shutdown\n");
+
+        return IRQ_HANDLED;
+}
+
 static int wm8994_codec_probe(struct snd_soc_codec *codec)
 {
         struct wm8994 *control;
@@ -2972,13 +3119,14 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
                 switch (wm8994->revision) {
                 case 2:
                 case 3:
-                        wm8994->hubs.dcs_codes = -5;
+                        wm8994->hubs.dcs_codes_l = -5;
+                        wm8994->hubs.dcs_codes_r = -5;
                         wm8994->hubs.hp_startup_mode = 1;
                         wm8994->hubs.dcs_readback_mode = 1;
                         wm8994->hubs.series_startup = 1;
                         break;
                 default:
-                        wm8994->hubs.dcs_readback_mode = 1;
+                        wm8994->hubs.dcs_readback_mode = 2;
                         break;
                 }
                 break;
@@ -2993,6 +3141,10 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
 
         wm8994_request_irq(codec->control_data, WM8994_IRQ_FIFOS_ERR,
                            wm8994_fifo_error, "FIFO error", codec);
+        wm8994_request_irq(wm8994->control_data, WM8994_IRQ_TEMP_WARN,
+                           wm8994_temp_warn, "Thermal warning", codec);
+        wm8994_request_irq(wm8994->control_data, WM8994_IRQ_TEMP_SHUT,
+                           wm8994_temp_shut, "Thermal shutdown", codec);
 
         ret = wm8994_request_irq(codec->control_data, WM8994_IRQ_DCS_DONE,
                                  wm_hubs_dcs_done, "DC servo done",
@@ -3257,6 +3409,8 @@ err_irq:
         wm8994_free_irq(codec->control_data, WM8994_IRQ_DCS_DONE,
                         &wm8994->hubs);
         wm8994_free_irq(codec->control_data, WM8994_IRQ_FIFOS_ERR, codec);
+        wm8994_free_irq(codec->control_data, WM8994_IRQ_TEMP_SHUT, codec);
+        wm8994_free_irq(codec->control_data, WM8994_IRQ_TEMP_WARN, codec);
 err:
         kfree(wm8994);
         return ret;
@@ -3279,6 +3433,8 @@ static int  wm8994_codec_remove(struct snd_soc_codec *codec)
         wm8994_free_irq(codec->control_data, WM8994_IRQ_DCS_DONE,
                         &wm8994->hubs);
         wm8994_free_irq(codec->control_data, WM8994_IRQ_FIFOS_ERR, codec);
+        wm8994_free_irq(codec->control_data, WM8994_IRQ_TEMP_SHUT, codec);
+        wm8994_free_irq(codec->control_data, WM8994_IRQ_TEMP_WARN, codec);
 
         switch (control->type) {
         case WM8994: