ALSA: hda - Enable loopback accounts for CONFIG_PM=n, too

[firefly-linux-kernel-4.4.55.git] / sound / pci / hda / hda_generic.h

diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h
index 980707fcd30a5ebc919de1dd65a6e7b8f5432e53..d5348dd7a14f36fedfb5ccf677f16c38a848f930 100644 (file)
--- a/sound/pci/hda/hda_generic.h
+++ b/sound/pci/hda/hda_generic.h
@@ -107,6 +107,7 @@ struct hda_gen_spec {
        hda_nid_t adc_nids[AUTO_CFG_MAX_INS];
        hda_nid_t dig_in_nid;           /* digital-in NID; optional */
        hda_nid_t mixer_nid;            /* analog-mixer NID */
+       hda_nid_t mixer_merge_nid;      /* aamix merge-point NID (optional) */
        const char *input_labels[HDA_MAX_NUM_INPUTS];
        int input_label_idxs[HDA_MAX_NUM_INPUTS];
 
@@ -163,6 +164,7 @@ struct hda_gen_spec {
        int digout_paths[AUTO_CFG_MAX_OUTS];
        int input_paths[HDA_MAX_NUM_INPUTS][AUTO_CFG_MAX_INS];
        int loopback_paths[HDA_MAX_NUM_INPUTS];
+       int loopback_merge_path;
        int digin_path;
 
        /* auto-mic stuff */
@@ -209,6 +211,7 @@ struct hda_gen_spec {
        unsigned int add_stereo_mix_input:1; /* add aamix as a capture src */
        unsigned int add_out_jack_modes:1; /* add output jack mode enum ctls */
        unsigned int add_in_jack_modes:1; /* add input jack mode enum ctls */
+       unsigned int power_down_unused:1; /* power down unused widgets */
 
        /* other internal flags */
        unsigned int no_analog:1; /* digital I/O only */
@@ -223,11 +226,10 @@ struct hda_gen_spec {
        hda_nid_t vmaster_nid;
        unsigned int vmaster_tlv[4];
        struct hda_vmaster_mute_hook vmaster_mute;
-#ifdef CONFIG_PM
+
        struct hda_loopback_check loopback;
        int num_loopbacks;
        struct hda_amp_list loopback_list[8];
-#endif
 
        /* multi-io */
        int multi_ios;