diff options
author | Wu Fengguang <fengguang.wu@intel.com> | 2010-05-07 08:47:54 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-26 14:32:04 -0700 |
commit | 3e8ea8f9e21e04850502833493b3cfa7c6606f5c (patch) | |
tree | fcfa30e783cfa8da986fe07a550fbb8db33cb7a5 /sound | |
parent | b759d0992e1fdcf2a76ebef37289e787b375fa28 (diff) |
ALSA: hda - fix DG45ID SPDIF output
commit 4d26f44657915f082806abfe3624aeded4c121fa upstream.
This reverts part of commit 52dc438606d1e, in order to fix a regression:
broken SPDIF output on Intel DG45FC motherboard (IDT 92HD73E1X5 codec).
--- DG45FC-IDT-codec-2.6.32 (SPDIF OK)
+++ DG45FC-IDT-codec-2.6.33 (SPDIF broken)
Node 0x22 [Pin Complex] wcaps 0x400301: Stereo Digital
Pincap 0x00000010: OUT
- Pin Default 0x40f000f0: [N/A] Other at Ext N/A
- Conn = Unknown, Color = Unknown
- DefAssociation = 0xf, Sequence = 0x0
- Pin-ctls: 0x00:
+ Pin Default 0x014510a0: [Jack] SPDIF Out at Ext Rear
+ Conn = Optical, Color = Black
+ DefAssociation = 0xa, Sequence = 0x0
+ Pin-ctls: 0x40: OUT
Connection: 3
0x25* 0x20 0x21
Node 0x23 [Pin Complex] wcaps 0x400301: Stereo Digital
Pincap 0x00000010: OUT
- Pin Default 0x01451140: [Jack] SPDIF Out at Ext Rear
+ Pin Default 0x074510b0: [Jack] SPDIF Out at Ext Rear Panel
Conn = Optical, Color = Black
- DefAssociation = 0x4, Sequence = 0x0
- Misc = NO_PRESENCE
- Pin-ctls: 0x40: OUT
+ DefAssociation = 0xb, Sequence = 0x0
+ Pin-ctls: 0x00:
Connection: 3
0x26* 0x20 0x21
Cc: Alexey Fisher <bug-track@fisher-privat.net>
Tested-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index ac2d528feb8d..cb474c0b60ac 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -1539,11 +1539,9 @@ static unsigned int alienware_m17x_pin_configs[13] = { 0x904601b0, }; -static unsigned int intel_dg45id_pin_configs[14] = { +static unsigned int intel_dg45id_pin_configs[13] = { 0x02214230, 0x02A19240, 0x01013214, 0x01014210, - 0x01A19250, 0x01011212, 0x01016211, 0x40f000f0, - 0x40f000f0, 0x40f000f0, 0x40f000f0, 0x014510A0, - 0x074510B0, 0x40f000f0 + 0x01A19250, 0x01011212, 0x01016211 }; static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = { |