Merge branch 'hpfs' from Mikulas Patocka

[karo-tx-linux.git] / sound / pci / hda / hda_generic.h

diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h
index 54e66516037980c6ecb36be0b30ca4488151d3a3..e199a852388b4506148b0cfcbcca7ee380406a52 100644 (file)
--- a/sound/pci/hda/hda_generic.h
+++ b/sound/pci/hda/hda_generic.h
@@ -209,6 +209,7 @@ struct hda_gen_spec {
        unsigned int master_mute:1;     /* master mute over all */
        unsigned int keep_vref_in_automute:1; /* Don't clear VREF in automute */
        unsigned int line_in_auto_switch:1; /* allow line-in auto switch */
+       unsigned int auto_mute_via_amp:1; /* auto-mute via amp instead of pinctl */
 
        /* parser behavior flags; set before snd_hda_gen_parse_auto_config() */
        unsigned int suppress_auto_mute:1; /* suppress input jack auto mute */
@@ -222,6 +223,7 @@ struct hda_gen_spec {
        unsigned int multi_cap_vol:1; /* allow multiple capture xxx volumes */
        unsigned int inv_dmic_split:1; /* inverted dmic w/a for conexant */
        unsigned int own_eapd_ctl:1; /* set EAPD by own function */
+       unsigned int keep_eapd_on:1; /* don't turn off EAPD automatically */
        unsigned int vmaster_mute_enum:1; /* add vmaster mute mode enum */
        unsigned int indep_hp:1; /* independent HP supported */
        unsigned int prefer_hp_amp:1; /* enable HP amp for speaker if any */
@@ -236,6 +238,9 @@ struct hda_gen_spec {
        unsigned int have_aamix_ctl:1;
        unsigned int hp_mic_jack_modes:1;
 
+       /* additional mute flags (only effective with auto_mute_via_amp=1) */
+       u64 mute_bits;
+
        /* badness tables for output path evaluations */
        const struct badness_table *main_out_badness;
        const struct badness_table *extra_out_badness;