aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_local.h
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/hda/hda_local.h')
-rw-r--r--sound/pci/hda/hda_local.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index ded32359b654..a9863eb20c75 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -213,7 +213,7 @@ enum {
213 213
214struct auto_pin_cfg { 214struct auto_pin_cfg {
215 int line_outs; 215 int line_outs;
216 hda_nid_t line_out_pins[4]; /* sorted in the order of Front/Surr/CLFE/Side */ 216 hda_nid_t line_out_pins[5]; /* sorted in the order of Front/Surr/CLFE/Side */
217 hda_nid_t speaker_pin; 217 hda_nid_t speaker_pin;
218 hda_nid_t hp_pin; 218 hda_nid_t hp_pin;
219 hda_nid_t input_pins[AUTO_PIN_LAST]; 219 hda_nid_t input_pins[AUTO_PIN_LAST];
@@ -227,7 +227,8 @@ struct auto_pin_cfg {
227#define get_defcfg_sequence(cfg) (cfg & AC_DEFCFG_SEQUENCE) 227#define get_defcfg_sequence(cfg) (cfg & AC_DEFCFG_SEQUENCE)
228#define get_defcfg_device(cfg) ((cfg & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT) 228#define get_defcfg_device(cfg) ((cfg & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT)
229 229
230int snd_hda_parse_pin_def_config(struct hda_codec *codec, struct auto_pin_cfg *cfg); 230int snd_hda_parse_pin_def_config(struct hda_codec *codec, struct auto_pin_cfg *cfg,
231 hda_nid_t *ignore_nids);
231 232
232/* amp values */ 233/* amp values */
233#define AMP_IN_MUTE(idx) (0x7080 | ((idx)<<8)) 234#define AMP_IN_MUTE(idx) (0x7080 | ((idx)<<8))