|
@@ -3599,14 +3599,34 @@ static void ad1884_fixup_amp_override(struct hda_codec *codec,
|
|
|
(1 << AC_AMPCAP_MUTE_SHIFT));
|
|
|
}
|
|
|
|
|
|
+/* toggle GPIO1 according to the mute state */
|
|
|
+static void ad1884_vmaster_hp_gpio_hook(void *private_data, int enabled)
|
|
|
+{
|
|
|
+ struct hda_codec *codec = private_data;
|
|
|
+ struct ad198x_spec *spec = codec->spec;
|
|
|
+
|
|
|
+ if (spec->eapd_nid)
|
|
|
+ ad_vmaster_eapd_hook(private_data, enabled);
|
|
|
+ snd_hda_codec_update_cache(codec, 0x01, 0,
|
|
|
+ AC_VERB_SET_GPIO_DATA,
|
|
|
+ enabled ? 0x00 : 0x02);
|
|
|
+}
|
|
|
+
|
|
|
static void ad1884_fixup_hp_eapd(struct hda_codec *codec,
|
|
|
const struct hda_fixup *fix, int action)
|
|
|
{
|
|
|
struct ad198x_spec *spec = codec->spec;
|
|
|
+ static const struct hda_verb gpio_init_verbs[] = {
|
|
|
+ {0x01, AC_VERB_SET_GPIO_MASK, 0x02},
|
|
|
+ {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x02},
|
|
|
+ {0x01, AC_VERB_SET_GPIO_DATA, 0x02},
|
|
|
+ {},
|
|
|
+ };
|
|
|
|
|
|
switch (action) {
|
|
|
case HDA_FIXUP_ACT_PRE_PROBE:
|
|
|
- spec->gen.vmaster_mute.hook = ad_vmaster_eapd_hook;
|
|
|
+ spec->gen.vmaster_mute.hook = ad1884_vmaster_hp_gpio_hook;
|
|
|
+ snd_hda_sequence_write_cache(codec, gpio_init_verbs);
|
|
|
break;
|
|
|
case HDA_FIXUP_ACT_PROBE:
|
|
|
if (spec->gen.autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT)
|