Merge branch 'test/hda-jack' into topic/hda

Conflicts:
	sound/pci/hda/patch_hdmi.c
	sound/pci/hda/patch_via.c

1 files changed, 19 insertions, 65 deletions

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 690f2a2a4595..d24adbd023ee 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -33,6 +33,7 @@
 #include "hda_codec.h"
 #include "hda_local.h"
 #include "hda_beep.h"
+#include "hda_jack.h"
 
 /* unsol event tags */
 #define ALC_FRONT_EVENT         0x01
@@ -184,6 +185,7 @@ struct alc_spec {
         unsigned int vol_in_capsrc:1; /* use capsrc volume (ADC has no vol) */
         unsigned int parse_flags; /* passed to snd_hda_parse_pin_defcfg() */
         unsigned int shared_mic_hp:1; /* HP/Mic-in sharing */
+        unsigned int use_jack_tbl:1; /* 1 for model=auto */
 
         /* auto-mute control */
         int automute_mode;
@@ -466,46 +468,6 @@ static void alc_fix_pll_init(struct hda_codec *codec, hda_nid_t nid,
 }
 
 /*
- * Jack-reporting via input-jack layer
- */
-
-/* initialization of jacks; currently checks only a few known pins */
-static int alc_init_jacks(struct hda_codec *codec)
-{
-#ifdef CONFIG_SND_HDA_INPUT_JACK
-        struct alc_spec *spec = codec->spec;
-        int err;
-        unsigned int hp_nid = spec->autocfg.hp_pins[0];
-        unsigned int mic_nid = spec->ext_mic_pin;
-        unsigned int dock_nid = spec->dock_mic_pin;
-
-        if (hp_nid) {
-                err = snd_hda_input_jack_add(codec, hp_nid,
-                                             SND_JACK_HEADPHONE, NULL);
-                if (err < 0)
-                        return err;
-                snd_hda_input_jack_report(codec, hp_nid);
-        }
-
-        if (mic_nid) {
-                err = snd_hda_input_jack_add(codec, mic_nid,
-                                             SND_JACK_MICROPHONE, NULL);
-                if (err < 0)
-                        return err;
-                snd_hda_input_jack_report(codec, mic_nid);
-        }
-        if (dock_nid) {
-                err = snd_hda_input_jack_add(codec, dock_nid,
-                                             SND_JACK_MICROPHONE, NULL);
-                if (err < 0)
-                        return err;
-                snd_hda_input_jack_report(codec, dock_nid);
-        }
-#endif /* CONFIG_SND_HDA_INPUT_JACK */
-        return 0;
-}
-
-/*
  * Jack detections for HP auto-mute and mic-switch
  */
 
@@ -518,7 +480,6 @@ static bool detect_jacks(struct hda_codec *codec, int num_pins, hda_nid_t *pins)
                 hda_nid_t nid = pins[i];
                 if (!nid)
                         break;
-                snd_hda_input_jack_report(codec, nid);
                 present |= snd_hda_jack_detect(codec, nid);
         }
         return present;
@@ -658,19 +619,18 @@ static void alc_mic_automute(struct hda_codec *codec)
                 alc_mux_select(codec, 0, spec->dock_mic_idx, false);
         else
                 alc_mux_select(codec, 0, spec->int_mic_idx, false);
-
-        snd_hda_input_jack_report(codec, pins[spec->ext_mic_idx]);
-        if (spec->dock_mic_idx >= 0)
-                snd_hda_input_jack_report(codec, pins[spec->dock_mic_idx]);
 }
 
 /* unsolicited event for HP jack sensing */
 static void alc_sku_unsol_event(struct hda_codec *codec, unsigned int res)
 {
+        struct alc_spec *spec = codec->spec;
         if (codec->vendor_id == 0x10ec0880)
                 res >>= 28;
         else
                 res >>= 26;
+        if (spec->use_jack_tbl)
+                res = snd_hda_jack_get_action(codec, res);
         switch (res) {
         case ALC_HP_EVENT:
                 alc_hp_automute(codec);
@@ -682,6 +642,7 @@ static void alc_sku_unsol_event(struct hda_codec *codec, unsigned int res)
                 alc_mic_automute(codec);
                 break;
         }
+        snd_hda_jack_report_sync(codec);
 }
 
 /* call init functions of standard auto-mute helpers */
@@ -971,9 +932,7 @@ static void alc_init_automute(struct hda_codec *codec)
                         continue;
                 snd_printdd("realtek: Enable HP auto-muting on NID 0x%x\n",
                             nid);
-                snd_hda_codec_write_cache(codec, nid, 0,
-                                  AC_VERB_SET_UNSOLICITED_ENABLE,
-                                  AC_USRSP_EN | ALC_HP_EVENT);
+                snd_hda_jack_detect_enable(codec, nid, ALC_HP_EVENT);
                 spec->detect_hp = 1;
         }
 
@@ -985,9 +944,8 @@ static void alc_init_automute(struct hda_codec *codec)
                                         continue;
                                 snd_printdd("realtek: Enable Line-Out "
                                             "auto-muting on NID 0x%x\n", nid);
-                                snd_hda_codec_write_cache(codec, nid, 0,
-                                                AC_VERB_SET_UNSOLICITED_ENABLE,
-                                                AC_USRSP_EN | ALC_FRONT_EVENT);
+                                snd_hda_jack_detect_enable(codec, nid,
+                                                           ALC_FRONT_EVENT);
                                 spec->detect_lo = 1;
                 }
                 spec->automute_lo_possible = spec->detect_hp;
@@ -1126,13 +1084,10 @@ static bool alc_auto_mic_check_imux(struct hda_codec *codec)
                 return false; /* no corresponding imux */
         }
 
-        snd_hda_codec_write_cache(codec, spec->ext_mic_pin, 0,
-                                  AC_VERB_SET_UNSOLICITED_ENABLE,
-                                  AC_USRSP_EN | ALC_MIC_EVENT);
+        snd_hda_jack_detect_enable(codec, spec->ext_mic_pin, ALC_MIC_EVENT);
         if (spec->dock_mic_pin)
-                snd_hda_codec_write_cache(codec, spec->dock_mic_pin, 0,
-                                  AC_VERB_SET_UNSOLICITED_ENABLE,
-                                  AC_USRSP_EN | ALC_MIC_EVENT);
+                snd_hda_jack_detect_enable(codec, spec->dock_mic_pin,
+                                           ALC_MIC_EVENT);
 
         spec->auto_mic_valid_imux = 1;
         spec->auto_mic = 1;
@@ -2074,6 +2029,10 @@ static int alc_build_controls(struct hda_codec *codec)
 
         alc_free_kctls(codec); /* no longer needed */
 
+        err = snd_hda_jack_add_kctls(codec, &spec->autocfg);
+        if (err < 0)
+                return err;
+
         return 0;
 }
 
@@ -2101,6 +2060,8 @@ static int alc_init(struct hda_codec *codec)
 
         alc_apply_fixup(codec, ALC_FIXUP_ACT_INIT);
 
+        snd_hda_jack_report_sync(codec);
+
         hda_call_check_power_status(codec, 0x01);
         return 0;
 }
@@ -2484,7 +2445,6 @@ static void alc_free(struct hda_codec *codec)
                 return;
 
         alc_shutup(codec);
-        snd_hda_input_jack_free(codec);
         alc_free_kctls(codec);
         alc_free_bind_ctls(codec);
         kfree(spec);
@@ -3944,6 +3904,7 @@ static void set_capture_mixer(struct hda_codec *codec)
 static void alc_auto_init_std(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
+        spec->use_jack_tbl = 1;
         alc_auto_init_multi_out(codec);
         alc_auto_init_extra_out(codec);
         alc_auto_init_analog_input(codec);
@@ -4731,7 +4692,6 @@ static int patch_alc882(struct hda_codec *codec)
         if (board_config == ALC_MODEL_AUTO)
                 spec->init_hook = alc_auto_init_std;
 
-        alc_init_jacks(codec);
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc882_loopbacks;
@@ -4909,7 +4869,6 @@ static int patch_alc262(struct hda_codec *codec)
         spec->init_hook = alc_auto_init_std;
         spec->shutup = alc_eapd_shutup;
 
-        alc_init_jacks(codec);
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc262_loopbacks;
@@ -5020,8 +4979,6 @@ static int patch_alc268(struct hda_codec *codec)
         spec->init_hook = alc_auto_init_std;
         spec->shutup = alc_eapd_shutup;
 
-        alc_init_jacks(codec);
-
         return 0;
 
  error:
@@ -5577,7 +5534,6 @@ static int patch_alc269(struct hda_codec *codec)
         spec->init_hook = alc_auto_init_std;
         spec->shutup = alc269_shutup;
 
-        alc_init_jacks(codec);
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc269_loopbacks;
@@ -6187,8 +6143,6 @@ static int patch_alc662(struct hda_codec *codec)
         spec->init_hook = alc_auto_init_std;
         spec->shutup = alc_eapd_shutup;
 
-        alc_init_jacks(codec);
-
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc662_loopbacks;