diff options
| author | Wu Fengguang <fengguang.wu@intel.com> | 2010-05-06 20:47:54 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-07 04:24:53 -0400 |
| commit | 4d26f44657915f082806abfe3624aeded4c121fa (patch) | |
| tree | d90ff9cd19364ea8b7446f7094289bf5861cbc17 | |
| parent | 8f0f5ff6777104084b4b2e1ae079541c2a6ed6d9 (diff) | |
ALSA: hda - fix DG45ID SPDIF output
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: <stable@kernel.org>
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>
| -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 7fb7d017a347..12825aa03106 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
| @@ -1544,11 +1544,9 @@ static unsigned int alienware_m17x_pin_configs[13] = { | |||
| 1544 | 0x904601b0, | 1544 | 0x904601b0, |
| 1545 | }; | 1545 | }; |
| 1546 | 1546 | ||
| 1547 | static unsigned int intel_dg45id_pin_configs[14] = { | 1547 | static unsigned int intel_dg45id_pin_configs[13] = { |
| 1548 | 0x02214230, 0x02A19240, 0x01013214, 0x01014210, | 1548 | 0x02214230, 0x02A19240, 0x01013214, 0x01014210, |
| 1549 | 0x01A19250, 0x01011212, 0x01016211, 0x40f000f0, | 1549 | 0x01A19250, 0x01011212, 0x01016211 |
| 1550 | 0x40f000f0, 0x40f000f0, 0x40f000f0, 0x014510A0, | ||
| 1551 | 0x074510B0, 0x40f000f0 | ||
| 1552 | }; | 1550 | }; |
| 1553 | 1551 | ||
| 1554 | static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = { | 1552 | static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = { |