|
@@ -3703,19 +3703,29 @@ static struct hda_amp_list ad1884a_loopbacks[] = {
|
|
|
* Port F: Internal speakers
|
|
|
*/
|
|
|
|
|
|
-static struct hda_input_mux ad1884a_laptop_capture_source = {
|
|
|
- .num_items = 4,
|
|
|
- .items = {
|
|
|
- { "Mic", 0x0 }, /* port-B */
|
|
|
- { "Internal Mic", 0x1 }, /* port-C */
|
|
|
- { "Dock Mic", 0x4 }, /* port-E */
|
|
|
- { "Mix", 0x3 },
|
|
|
- },
|
|
|
-};
|
|
|
+static int ad1884a_mobile_master_sw_put(struct snd_kcontrol *kcontrol,
|
|
|
+ struct snd_ctl_elem_value *ucontrol)
|
|
|
+{
|
|
|
+ struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
|
|
|
+ int ret = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);
|
|
|
+ int mute = (!ucontrol->value.integer.value[0] &&
|
|
|
+ !ucontrol->value.integer.value[1]);
|
|
|
+ /* toggle GPIO1 according to the mute state */
|
|
|
+ snd_hda_codec_write_cache(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA,
|
|
|
+ mute ? 0x02 : 0x0);
|
|
|
+ return ret;
|
|
|
+}
|
|
|
|
|
|
static struct snd_kcontrol_new ad1884a_laptop_mixers[] = {
|
|
|
HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),
|
|
|
- HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),
|
|
|
+ {
|
|
|
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
|
|
+ .name = "Master Playback Switch",
|
|
|
+ .info = snd_hda_mixer_amp_switch_info,
|
|
|
+ .get = snd_hda_mixer_amp_switch_get,
|
|
|
+ .put = ad1884a_mobile_master_sw_put,
|
|
|
+ .private_value = HDA_COMPOSE_AMP_VAL(0x21, 3, 0, HDA_OUTPUT),
|
|
|
+ },
|
|
|
HDA_CODEC_MUTE("Dock Playback Switch", 0x12, 0x0, HDA_OUTPUT),
|
|
|
HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT),
|
|
|
HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),
|
|
@@ -3730,36 +3740,9 @@ static struct snd_kcontrol_new ad1884a_laptop_mixers[] = {
|
|
|
HDA_CODEC_VOLUME("Dock Mic Boost", 0x25, 0x0, HDA_OUTPUT),
|
|
|
HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
|
|
|
HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
|
|
|
- HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT),
|
|
|
- HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x0d, 0x0, HDA_OUTPUT),
|
|
|
- {
|
|
|
- .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
|
|
- /* The multiple "Capture Source" controls confuse alsamixer
|
|
|
- * So call somewhat different..
|
|
|
- */
|
|
|
- /* .name = "Capture Source", */
|
|
|
- .name = "Input Source",
|
|
|
- .count = 2,
|
|
|
- .info = ad198x_mux_enum_info,
|
|
|
- .get = ad198x_mux_enum_get,
|
|
|
- .put = ad198x_mux_enum_put,
|
|
|
- },
|
|
|
{ } /* end */
|
|
|
};
|
|
|
|
|
|
-static int ad1884a_mobile_master_sw_put(struct snd_kcontrol *kcontrol,
|
|
|
- struct snd_ctl_elem_value *ucontrol)
|
|
|
-{
|
|
|
- struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
|
|
|
- int ret = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);
|
|
|
- int mute = (!ucontrol->value.integer.value[0] &&
|
|
|
- !ucontrol->value.integer.value[1]);
|
|
|
- /* toggle GPIO1 according to the mute state */
|
|
|
- snd_hda_codec_write_cache(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA,
|
|
|
- mute ? 0x02 : 0x0);
|
|
|
- return ret;
|
|
|
-}
|
|
|
-
|
|
|
static struct snd_kcontrol_new ad1884a_mobile_mixers[] = {
|
|
|
HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),
|
|
|
/*HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),*/
|
|
@@ -3829,6 +3812,63 @@ static int ad1884a_hp_init(struct hda_codec *codec)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+/* mute internal speaker if HP or docking HP is plugged */
|
|
|
+static void ad1884a_laptop_automute(struct hda_codec *codec)
|
|
|
+{
|
|
|
+ unsigned int present;
|
|
|
+
|
|
|
+ present = snd_hda_codec_read(codec, 0x11, 0, AC_VERB_GET_PIN_SENSE, 0);
|
|
|
+ present &= AC_PINSENSE_PRESENCE;
|
|
|
+ if (!present) {
|
|
|
+ present = snd_hda_codec_read(codec, 0x12, 0,
|
|
|
+ AC_VERB_GET_PIN_SENSE, 0);
|
|
|
+ present &= AC_PINSENSE_PRESENCE;
|
|
|
+ }
|
|
|
+ snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,
|
|
|
+ HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
|
|
|
+ snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_EAPD_BTLENABLE,
|
|
|
+ present ? 0x00 : 0x02);
|
|
|
+}
|
|
|
+
|
|
|
+/* switch to external mic if plugged */
|
|
|
+static void ad1884a_laptop_automic(struct hda_codec *codec)
|
|
|
+{
|
|
|
+ unsigned int idx;
|
|
|
+
|
|
|
+ if (snd_hda_codec_read(codec, 0x14, 0, AC_VERB_GET_PIN_SENSE, 0) &
|
|
|
+ AC_PINSENSE_PRESENCE)
|
|
|
+ idx = 0;
|
|
|
+ else if (snd_hda_codec_read(codec, 0x1c, 0, AC_VERB_GET_PIN_SENSE, 0) &
|
|
|
+ AC_PINSENSE_PRESENCE)
|
|
|
+ idx = 4;
|
|
|
+ else
|
|
|
+ idx = 1;
|
|
|
+ snd_hda_codec_write(codec, 0x0c, 0, AC_VERB_SET_CONNECT_SEL, idx);
|
|
|
+}
|
|
|
+
|
|
|
+/* unsolicited event for HP jack sensing */
|
|
|
+static void ad1884a_laptop_unsol_event(struct hda_codec *codec,
|
|
|
+ unsigned int res)
|
|
|
+{
|
|
|
+ switch (res >> 26) {
|
|
|
+ case AD1884A_HP_EVENT:
|
|
|
+ ad1884a_laptop_automute(codec);
|
|
|
+ break;
|
|
|
+ case AD1884A_MIC_EVENT:
|
|
|
+ ad1884a_laptop_automic(codec);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+/* initialize jack-sensing, too */
|
|
|
+static int ad1884a_laptop_init(struct hda_codec *codec)
|
|
|
+{
|
|
|
+ ad198x_init(codec);
|
|
|
+ ad1884a_laptop_automute(codec);
|
|
|
+ ad1884a_laptop_automic(codec);
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
/* additional verbs for laptop model */
|
|
|
static struct hda_verb ad1884a_laptop_verbs[] = {
|
|
|
/* Port-A (HP) pin - always unmuted */
|
|
@@ -3849,7 +3889,9 @@ static struct hda_verb ad1884a_laptop_verbs[] = {
|
|
|
{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
|
|
|
/* unsolicited event for pin-sense */
|
|
|
{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_HP_EVENT},
|
|
|
+ {0x12, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_HP_EVENT},
|
|
|
{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_MIC_EVENT},
|
|
|
+ {0x1c, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_MIC_EVENT},
|
|
|
{ } /* end */
|
|
|
};
|
|
|
|
|
@@ -4059,9 +4101,8 @@ static int patch_ad1884a(struct hda_codec *codec)
|
|
|
spec->mixers[0] = ad1884a_laptop_mixers;
|
|
|
spec->init_verbs[spec->num_init_verbs++] = ad1884a_laptop_verbs;
|
|
|
spec->multiout.dig_out_nid = 0;
|
|
|
- spec->input_mux = &ad1884a_laptop_capture_source;
|
|
|
- codec->patch_ops.unsol_event = ad1884a_hp_unsol_event;
|
|
|
- codec->patch_ops.init = ad1884a_hp_init;
|
|
|
+ codec->patch_ops.unsol_event = ad1884a_laptop_unsol_event;
|
|
|
+ codec->patch_ops.init = ad1884a_laptop_init;
|
|
|
/* set the upper-limit for mixer amp to 0dB for avoiding the
|
|
|
* possible damage by overloading
|
|
|
*/
|