diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-05 22:00:12 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-05 22:00:12 -0400 |
| commit | 8ac65de6474e72f1cfc130e3cc1a4bfd5cf8e310 (patch) | |
| tree | 12541f0f74db094885ecafc150e8fac885bdce69 | |
| parent | 0855250e218eba2eab574959058432beedf0ea5f (diff) | |
| parent | f3cd3f5d341dc5218d0138a67945182e83174af9 (diff) | |
Merge branch 'topic/hda' into for-linus
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 5 | ||||
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 82097790f6f3..f35e58a2d921 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -8764,6 +8764,10 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { | |||
| 8764 | {} | 8764 | {} |
| 8765 | }; | 8765 | }; |
| 8766 | 8766 | ||
| 8767 | static hda_nid_t alc883_slave_dig_outs[] = { | ||
| 8768 | ALC1200_DIGOUT_NID, 0, | ||
| 8769 | }; | ||
| 8770 | |||
| 8767 | static hda_nid_t alc1200_slave_dig_outs[] = { | 8771 | static hda_nid_t alc1200_slave_dig_outs[] = { |
| 8768 | ALC883_DIGOUT_NID, 0, | 8772 | ALC883_DIGOUT_NID, 0, |
| 8769 | }; | 8773 | }; |
| @@ -8809,6 +8813,7 @@ static struct alc_config_preset alc883_presets[] = { | |||
| 8809 | .dac_nids = alc883_dac_nids, | 8813 | .dac_nids = alc883_dac_nids, |
| 8810 | .dig_out_nid = ALC883_DIGOUT_NID, | 8814 | .dig_out_nid = ALC883_DIGOUT_NID, |
| 8811 | .dig_in_nid = ALC883_DIGIN_NID, | 8815 | .dig_in_nid = ALC883_DIGIN_NID, |
| 8816 | .slave_dig_outs = alc883_slave_dig_outs, | ||
| 8812 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_intel_modes), | 8817 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_intel_modes), |
| 8813 | .channel_mode = alc883_3ST_6ch_intel_modes, | 8818 | .channel_mode = alc883_3ST_6ch_intel_modes, |
| 8814 | .need_dac_fix = 1, | 8819 | .need_dac_fix = 1, |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index b5e108aa8f63..b34d78b88a85 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
| @@ -4895,6 +4895,7 @@ again: | |||
| 4895 | switch (codec->vendor_id) { | 4895 | switch (codec->vendor_id) { |
| 4896 | case 0x111d7604: | 4896 | case 0x111d7604: |
| 4897 | case 0x111d7605: | 4897 | case 0x111d7605: |
| 4898 | case 0x111d76d5: | ||
| 4898 | if (spec->board_config == STAC_92HD83XXX_PWR_REF) | 4899 | if (spec->board_config == STAC_92HD83XXX_PWR_REF) |
| 4899 | break; | 4900 | break; |
| 4900 | spec->num_pwrs = 0; | 4901 | spec->num_pwrs = 0; |
| @@ -5707,6 +5708,7 @@ static struct hda_codec_preset snd_hda_preset_sigmatel[] = { | |||
| 5707 | { .id = 0x111d7603, .name = "92HD75B3X5", .patch = patch_stac92hd71bxx}, | 5708 | { .id = 0x111d7603, .name = "92HD75B3X5", .patch = patch_stac92hd71bxx}, |
| 5708 | { .id = 0x111d7604, .name = "92HD83C1X5", .patch = patch_stac92hd83xxx}, | 5709 | { .id = 0x111d7604, .name = "92HD83C1X5", .patch = patch_stac92hd83xxx}, |
| 5709 | { .id = 0x111d7605, .name = "92HD81B1X5", .patch = patch_stac92hd83xxx}, | 5710 | { .id = 0x111d7605, .name = "92HD81B1X5", .patch = patch_stac92hd83xxx}, |
| 5711 | { .id = 0x111d76d5, .name = "92HD81B1C5", .patch = patch_stac92hd83xxx}, | ||
| 5710 | { .id = 0x111d7608, .name = "92HD75B2X5", .patch = patch_stac92hd71bxx}, | 5712 | { .id = 0x111d7608, .name = "92HD75B2X5", .patch = patch_stac92hd71bxx}, |
| 5711 | { .id = 0x111d7674, .name = "92HD73D1X5", .patch = patch_stac92hd73xx }, | 5713 | { .id = 0x111d7674, .name = "92HD73D1X5", .patch = patch_stac92hd73xx }, |
| 5712 | { .id = 0x111d7675, .name = "92HD73C1X5", .patch = patch_stac92hd73xx }, | 5714 | { .id = 0x111d7675, .name = "92HD73C1X5", .patch = patch_stac92hd73xx }, |
