diff options
Diffstat (limited to 'sound/pci/hda')
-rw-r--r-- | sound/pci/hda/hda_codec.c | 8 | ||||
-rw-r--r-- | sound/pci/hda/hda_local.h | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 0129e95672a..dd419ce43d9 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -3392,10 +3392,18 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, | |||
3392 | case AC_JACK_SPDIF_OUT: | 3392 | case AC_JACK_SPDIF_OUT: |
3393 | case AC_JACK_DIG_OTHER_OUT: | 3393 | case AC_JACK_DIG_OTHER_OUT: |
3394 | cfg->dig_out_pin = nid; | 3394 | cfg->dig_out_pin = nid; |
3395 | if (loc == AC_JACK_LOC_HDMI) | ||
3396 | cfg->dig_out_type = HDA_PCM_TYPE_HDMI; | ||
3397 | else | ||
3398 | cfg->dig_out_type = HDA_PCM_TYPE_SPDIF; | ||
3395 | break; | 3399 | break; |
3396 | case AC_JACK_SPDIF_IN: | 3400 | case AC_JACK_SPDIF_IN: |
3397 | case AC_JACK_DIG_OTHER_IN: | 3401 | case AC_JACK_DIG_OTHER_IN: |
3398 | cfg->dig_in_pin = nid; | 3402 | cfg->dig_in_pin = nid; |
3403 | if (loc == AC_JACK_LOC_HDMI) | ||
3404 | cfg->dig_in_type = HDA_PCM_TYPE_HDMI; | ||
3405 | else | ||
3406 | cfg->dig_in_type = HDA_PCM_TYPE_SPDIF; | ||
3399 | break; | 3407 | break; |
3400 | } | 3408 | } |
3401 | } | 3409 | } |
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index 1dd8716c387..a4ecd77a451 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h | |||
@@ -355,6 +355,8 @@ struct auto_pin_cfg { | |||
355 | hda_nid_t dig_out_pin; | 355 | hda_nid_t dig_out_pin; |
356 | hda_nid_t dig_in_pin; | 356 | hda_nid_t dig_in_pin; |
357 | hda_nid_t mono_out_pin; | 357 | hda_nid_t mono_out_pin; |
358 | int dig_out_type; /* HDA_PCM_TYPE_XXX */ | ||
359 | int dig_in_type; /* HDA_PCM_TYPE_XXX */ | ||
358 | }; | 360 | }; |
359 | 361 | ||
360 | #define get_defcfg_connect(cfg) \ | 362 | #define get_defcfg_connect(cfg) \ |