1 files changed, 66 insertions, 3 deletions

diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index de625813c0e6..657808ba1418 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -19,6 +19,7 @@
 #include <sound/tlv.h>
 
 #include <linux/mfd/arizona/core.h>
+#include <linux/mfd/arizona/gpio.h>
 #include <linux/mfd/arizona/registers.h>
 
 #include "arizona.h"
@@ -199,9 +200,16 @@ int arizona_init_spk(struct snd_soc_codec *codec)
         if (ret != 0)
                 return ret;
 
-        ret = snd_soc_dapm_new_controls(&codec->dapm, &arizona_spkr, 1);
-        if (ret != 0)
-                return ret;
+        switch (arizona->type) {
+        case WM8997:
+                break;
+        default:
+                ret = snd_soc_dapm_new_controls(&codec->dapm,
+                                                &arizona_spkr, 1);
+                if (ret != 0)
+                        return ret;
+                break;
+        }
 
         ret = arizona_request_irq(arizona, ARIZONA_IRQ_SPK_SHUTDOWN_WARN,
                                   "Thermal warning", arizona_thermal_warn,
@@ -223,6 +231,41 @@ int arizona_init_spk(struct snd_soc_codec *codec)
 }
 EXPORT_SYMBOL_GPL(arizona_init_spk);
 
+int arizona_init_gpio(struct snd_soc_codec *codec)
+{
+        struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
+        struct arizona *arizona = priv->arizona;
+        int i;
+
+        switch (arizona->type) {
+        case WM5110:
+                snd_soc_dapm_disable_pin(&codec->dapm, "DRC2 Signal Activity");
+                break;
+        default:
+                break;
+        }
+
+        snd_soc_dapm_disable_pin(&codec->dapm, "DRC1 Signal Activity");
+
+        for (i = 0; i < ARRAY_SIZE(arizona->pdata.gpio_defaults); i++) {
+                switch (arizona->pdata.gpio_defaults[i] & ARIZONA_GPN_FN_MASK) {
+                case ARIZONA_GP_FN_DRC1_SIGNAL_DETECT:
+                        snd_soc_dapm_enable_pin(&codec->dapm,
+                                                "DRC1 Signal Activity");
+                        break;
+                case ARIZONA_GP_FN_DRC2_SIGNAL_DETECT:
+                        snd_soc_dapm_enable_pin(&codec->dapm,
+                                                "DRC2 Signal Activity");
+                        break;
+                default:
+                        break;
+                }
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(arizona_init_gpio);
+
 const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS] = {
         "None",
         "Tone Generator 1",
@@ -517,6 +560,26 @@ const struct soc_enum arizona_ng_hold =
                         4, arizona_ng_hold_text);
 EXPORT_SYMBOL_GPL(arizona_ng_hold);
 
+static const char * const arizona_in_dmic_osr_text[] = {
+        "1.536MHz", "3.072MHz", "6.144MHz",
+};
+
+const struct soc_enum arizona_in_dmic_osr[] = {
+        SOC_ENUM_SINGLE(ARIZONA_IN1L_CONTROL, ARIZONA_IN1_OSR_SHIFT,
+                        ARRAY_SIZE(arizona_in_dmic_osr_text),
+                        arizona_in_dmic_osr_text),
+        SOC_ENUM_SINGLE(ARIZONA_IN2L_CONTROL, ARIZONA_IN2_OSR_SHIFT,
+                        ARRAY_SIZE(arizona_in_dmic_osr_text),
+                        arizona_in_dmic_osr_text),
+        SOC_ENUM_SINGLE(ARIZONA_IN3L_CONTROL, ARIZONA_IN3_OSR_SHIFT,
+                        ARRAY_SIZE(arizona_in_dmic_osr_text),
+                        arizona_in_dmic_osr_text),
+        SOC_ENUM_SINGLE(ARIZONA_IN4L_CONTROL, ARIZONA_IN4_OSR_SHIFT,
+                        ARRAY_SIZE(arizona_in_dmic_osr_text),
+                        arizona_in_dmic_osr_text),
+};
+EXPORT_SYMBOL_GPL(arizona_in_dmic_osr);
+
 static void arizona_in_set_vu(struct snd_soc_codec *codec, int ena)
 {
         struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);