Revert "ASoC: rt5651: Enable jack detection on JD* pins"

This reverts commit 60d5a1a47b9a8381c08d2263b11ac9c757c87746.

Signed-off-by: Mark Brown <broonie@kernel.org>

3 files changed, 2 insertions, 178 deletions

diff --git a/include/sound/rt5651.h b/include/sound/rt5651.h
index 18b79a761f10..d35de758dfb5 100644
--- a/include/sound/rt5651.h
+++ b/include/sound/rt5651.h
@@ -11,19 +11,11 @@
 #ifndef __LINUX_SND_RT5651_H
 #define __LINUX_SND_RT5651_H
 
-enum rt5651_jd_src {
-        RT5651_JD_NULL,
-        RT5651_JD1_1,
-        RT5651_JD1_2,
-        RT5651_JD2,
-};
-
 struct rt5651_platform_data {
         /* IN2 can optionally be differential */
         bool in2_diff;
 
         bool dmic_en;
-        enum rt5651_jd_src jd_src;
 };
 
 #endif
diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c
index 2f0d0055c72f..da60b28ba3df 100644
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
@@ -26,7 +26,6 @@
 #include <sound/soc-dapm.h>
 #include <sound/initval.h>
 #include <sound/tlv.h>
-#include <sound/jack.h>
 
 #include "rl6231.h"
 #include "rt5651.h"
@@ -881,9 +880,6 @@ static const struct snd_soc_dapm_widget rt5651_dapm_widgets[] = {
         SND_SOC_DAPM_SUPPLY("PLL1", RT5651_PWR_ANLG2,
                         RT5651_PWR_PLL_BIT, 0, NULL, 0),
         /* Input Side */
-        SND_SOC_DAPM_SUPPLY("JD Power", RT5651_PWR_ANLG2,
-                RT5651_PWM_JD_M_BIT, 0, NULL, 0),
-
         /* micbias */
         SND_SOC_DAPM_SUPPLY("LDO", RT5651_PWR_ANLG1,
                         RT5651_PWR_LDO_BIT, 0, NULL, 0),
@@ -1532,8 +1528,6 @@ static int rt5651_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
 static int rt5651_set_bias_level(struct snd_soc_codec *codec,
                         enum snd_soc_bias_level level)
 {
-        struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
-
         switch (level) {
         case SND_SOC_BIAS_PREPARE:
                 if (SND_SOC_BIAS_STANDBY == snd_soc_codec_get_bias_level(codec)) {
@@ -1562,13 +1556,8 @@ static int rt5651_set_bias_level(struct snd_soc_codec *codec,
                 snd_soc_write(codec, RT5651_PWR_DIG2, 0x0000);
                 snd_soc_write(codec, RT5651_PWR_VOL, 0x0000);
                 snd_soc_write(codec, RT5651_PWR_MIXER, 0x0000);
-                if (rt5651->pdata.jd_src) {
-                        snd_soc_write(codec, RT5651_PWR_ANLG2, 0x0204);
-                        snd_soc_write(codec, RT5651_PWR_ANLG1, 0x0002);
-                } else {
-                        snd_soc_write(codec, RT5651_PWR_ANLG1, 0x0000);
-                        snd_soc_write(codec, RT5651_PWR_ANLG2, 0x0000);
-                }
+                snd_soc_write(codec, RT5651_PWR_ANLG1, 0x0000);
+                snd_soc_write(codec, RT5651_PWR_ANLG2, 0x0000);
                 break;
 
         default:
@@ -1581,7 +1570,6 @@ static int rt5651_set_bias_level(struct snd_soc_codec *codec,
 static int rt5651_probe(struct snd_soc_codec *codec)
 {
         struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
-        struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
 
         rt5651->codec = codec;
 
@@ -1597,15 +1585,6 @@ static int rt5651_probe(struct snd_soc_codec *codec)
 
         snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_OFF);
 
-        if (rt5651->pdata.jd_src) {
-                snd_soc_dapm_force_enable_pin(dapm, "JD Power");
-                snd_soc_dapm_force_enable_pin(dapm, "LDO");
-                snd_soc_dapm_sync(dapm);
-
-                regmap_update_bits(rt5651->regmap, RT5651_MICBIAS,
-                                   0x38, 0x38);
-        }
-
         return 0;
 }
 
@@ -1749,93 +1728,6 @@ static int rt5651_parse_dt(struct rt5651_priv *rt5651, struct device_node *np)
         return 0;
 }
 
-static irqreturn_t rt5651_irq(int irq, void *data)
-{
-        struct rt5651_priv *rt5651 = data;
-
-        queue_delayed_work(system_power_efficient_wq,
-                           &rt5651->jack_detect_work, msecs_to_jiffies(250));
-
-        return IRQ_HANDLED;
-}
-
-static int rt5651_jack_detect(struct snd_soc_codec *codec, int jack_insert)
-{
-        struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
-        int jack_type;
-
-        if (jack_insert) {
-                snd_soc_dapm_force_enable_pin(dapm, "LDO");
-                snd_soc_dapm_sync(dapm);
-
-                snd_soc_update_bits(codec, RT5651_MICBIAS,
-                                    RT5651_MIC1_OVCD_MASK |
-                                    RT5651_MIC1_OVTH_MASK |
-                                    RT5651_PWR_CLK12M_MASK |
-                                    RT5651_PWR_MB_MASK,
-                                    RT5651_MIC1_OVCD_EN |
-                                    RT5651_MIC1_OVTH_600UA |
-                                    RT5651_PWR_MB_PU |
-                                    RT5651_PWR_CLK12M_PU);
-                msleep(100);
-                if (snd_soc_read(codec, RT5651_IRQ_CTRL2) & RT5651_MB1_OC_CLR)
-                        jack_type = SND_JACK_HEADPHONE;
-                else
-                        jack_type = SND_JACK_HEADSET;
-                snd_soc_update_bits(codec, RT5651_IRQ_CTRL2,
-                                    RT5651_MB1_OC_CLR, 0);
-        } else { /* jack out */
-                jack_type = 0;
-
-                snd_soc_update_bits(codec, RT5651_MICBIAS,
-                                    RT5651_MIC1_OVCD_MASK,
-                                    RT5651_MIC1_OVCD_DIS);
-        }
-
-        return jack_type;
-}
-
-static void rt5651_jack_detect_work(struct work_struct *work)
-{
-        struct rt5651_priv *rt5651 =
-                container_of(work, struct rt5651_priv, jack_detect_work.work);
-
-        int report, val = 0;
-
-        if (!rt5651->codec)
-                return;
-
-        switch (rt5651->pdata.jd_src) {
-        case RT5651_JD1_1:
-                val = snd_soc_read(rt5651->codec, RT5651_INT_IRQ_ST) & 0x1000;
-                break;
-        case RT5651_JD1_2:
-                val = snd_soc_read(rt5651->codec, RT5651_INT_IRQ_ST) & 0x2000;
-                break;
-        case RT5651_JD2:
-                val = snd_soc_read(rt5651->codec, RT5651_INT_IRQ_ST) & 0x4000;
-                break;
-        default:
-                break;
-        }
-
-        report = rt5651_jack_detect(rt5651->codec, !val);
-
-        snd_soc_jack_report(rt5651->hp_jack, report, SND_JACK_HEADSET);
-}
-
-int rt5651_set_jack_detect(struct snd_soc_codec *codec,
-                           struct snd_soc_jack *hp_jack)
-{
-        struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
-
-        rt5651->hp_jack = hp_jack;
-        rt5651_irq(0, rt5651);
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(rt5651_set_jack_detect);
-
 static int rt5651_i2c_probe(struct i2c_client *i2c,
                     const struct i2c_device_id *id)
 {
@@ -1887,59 +1779,6 @@ static int rt5651_i2c_probe(struct i2c_client *i2c,