diff options
Diffstat (limited to 'sound/pci/hda')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 2 | ||||
-rw-r--r-- | sound/pci/hda/patch_analog.c | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index e37bffec749a..43b7cfb7cffd 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -2692,7 +2692,7 @@ static void __devexit azx_remove(struct pci_dev *pci) | |||
2692 | } | 2692 | } |
2693 | 2693 | ||
2694 | /* PCI IDs */ | 2694 | /* PCI IDs */ |
2695 | static struct pci_device_id azx_ids[] = { | 2695 | static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { |
2696 | /* ICH 6..10 */ | 2696 | /* ICH 6..10 */ |
2697 | { PCI_DEVICE(0x8086, 0x2668), .driver_data = AZX_DRIVER_ICH }, | 2697 | { PCI_DEVICE(0x8086, 0x2668), .driver_data = AZX_DRIVER_ICH }, |
2698 | { PCI_DEVICE(0x8086, 0x27d8), .driver_data = AZX_DRIVER_ICH }, | 2698 | { PCI_DEVICE(0x8086, 0x27d8), .driver_data = AZX_DRIVER_ICH }, |
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 7832f363496f..e6d1bdff1b6e 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c | |||
@@ -2465,6 +2465,12 @@ static struct hda_verb ad1988_spdif_init_verbs[] = { | |||
2465 | { } | 2465 | { } |
2466 | }; | 2466 | }; |
2467 | 2467 | ||
2468 | static struct hda_verb ad1988_spdif_in_init_verbs[] = { | ||
2469 | /* unmute SPDIF input pin */ | ||
2470 | {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | ||
2471 | { } | ||
2472 | }; | ||
2473 | |||
2468 | /* AD1989 has no ADC -> SPDIF route */ | 2474 | /* AD1989 has no ADC -> SPDIF route */ |
2469 | static struct hda_verb ad1989_spdif_init_verbs[] = { | 2475 | static struct hda_verb ad1989_spdif_init_verbs[] = { |
2470 | /* SPDIF-1 out pin */ | 2476 | /* SPDIF-1 out pin */ |
@@ -3200,8 +3206,11 @@ static int patch_ad1988(struct hda_codec *codec) | |||
3200 | ad1988_spdif_init_verbs; | 3206 | ad1988_spdif_init_verbs; |
3201 | } | 3207 | } |
3202 | } | 3208 | } |
3203 | if (spec->dig_in_nid && codec->vendor_id < 0x11d4989a) | 3209 | if (spec->dig_in_nid && codec->vendor_id < 0x11d4989a) { |
3204 | spec->mixers[spec->num_mixers++] = ad1988_spdif_in_mixers; | 3210 | spec->mixers[spec->num_mixers++] = ad1988_spdif_in_mixers; |
3211 | spec->init_verbs[spec->num_init_verbs++] = | ||
3212 | ad1988_spdif_in_init_verbs; | ||
3213 | } | ||
3205 | 3214 | ||
3206 | codec->patch_ops = ad198x_patch_ops; | 3215 | codec->patch_ops = ad198x_patch_ops; |
3207 | switch (board_config) { | 3216 | switch (board_config) { |