aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_local.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-09-20 11:10:27 -0400
committerJaroslav Kysela <perex@suse.cz>2006-09-23 04:47:38 -0400
commiteb06ed8f4c2440558ebf465e8baeac6367d90201 (patch)
tree60501d5c4e918f96d26033b95373f4368ca929e2 /sound/pci/hda/hda_local.h
parent33ef765131bcf82bc5fca3f25d8313fa4df93ce0 (diff)
[ALSA] hda-codec - Support multiple headphone pins
Some machines have multiple headpohne pins (usually on the lpatop and on the docking station) while the current hda-codec driver assumes a single headphone pin. Now it supports multiple hp pins (at least for detection). The sigmatel 92xx code supports this new multiple hp pins. It detects all hp pins for auto-muting, too. Also, the driver checks speaker pins in addition. In some cases, all line-out, speaker and hp-pins coexist. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/hda/hda_local.h')
-rw-r--r--sound/pci/hda/hda_local.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index ff24266fe353..f9416c36396e 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -229,7 +229,8 @@ struct auto_pin_cfg {
229 hda_nid_t line_out_pins[5]; /* sorted in the order of Front/Surr/CLFE/Side */ 229 hda_nid_t line_out_pins[5]; /* sorted in the order of Front/Surr/CLFE/Side */
230 int speaker_outs; 230 int speaker_outs;
231 hda_nid_t speaker_pins[5]; 231 hda_nid_t speaker_pins[5];
232 hda_nid_t hp_pin; 232 int hp_outs;
233 hda_nid_t hp_pins[5];
233 hda_nid_t input_pins[AUTO_PIN_LAST]; 234 hda_nid_t input_pins[AUTO_PIN_LAST];
234 hda_nid_t dig_out_pin; 235 hda_nid_t dig_out_pin;
235 hda_nid_t dig_in_pin; 236 hda_nid_t dig_in_pin;