Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit c4c8ea948aa21527d502e87227b2f1d951bc506d

Authored by Jason Gaston
Committed by Linus Torvalds
1 parent d69332b875
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] intel8x0: AC'97 audio patch for Intel ESB2 

This patch adds the Intel ESB2 DID's to the intel8x0.c file for AC'97 audio
support.

Signed-off-by:  Jason Gaston <Jason.d.gaston@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 6 additions and 0 deletions Side-by-side Diff

sound/pci/intel8x0.c
Diff comments   View file @ c4c8ea9
... ... @@ -55,6 +55,7 @@
55 55 "{Intel,ICH6},"
56 56 "{Intel,ICH7},"
57 57 "{Intel,6300ESB},"
  58 + "{Intel,ESB2},"
58 59 "{Intel,MX440},"
59 60 "{SiS,SI7012},"
60 61 "{NVidia,nForce Audio},"
... ... @@ -124,6 +125,9 @@
124 125 #ifndef PCI_DEVICE_ID_INTEL_ICH7_20
125 126 #define PCI_DEVICE_ID_INTEL_ICH7_20 0x27de
126 127 #endif
  128 +#ifndef PCI_DEVICE_ID_INTEL_ESB2_13
  129 +#define PCI_DEVICE_ID_INTEL_ESB2_13 0x2698
  130 +#endif
127 131 #ifndef PCI_DEVICE_ID_SI_7012
128 132 #define PCI_DEVICE_ID_SI_7012 0x7012
129 133 #endif
... ... @@ -443,6 +447,7 @@
443 447 { 0x8086, 0x25a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ESB */
444 448 { 0x8086, 0x266e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH6 */
445 449 { 0x8086, 0x27de, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH7 */
  450 + { 0x8086, 0x2698, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ESB2 */
446 451 { 0x8086, 0x7195, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 440MX */
447 452 { 0x1039, 0x7012, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_SIS }, /* SI7012 */
448 453 { 0x10de, 0x01b1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE */
... ... @@ -2736,6 +2741,7 @@
2736 2741 { PCI_DEVICE_ID_INTEL_ESB_5, "Intel 6300ESB" },
2737 2742 { PCI_DEVICE_ID_INTEL_ICH6_18, "Intel ICH6" },
2738 2743 { PCI_DEVICE_ID_INTEL_ICH7_20, "Intel ICH7" },
  2744 + { PCI_DEVICE_ID_INTEL_ESB2_13, "Intel ESB2" },
2739 2745 { PCI_DEVICE_ID_SI_7012, "SiS SI7012" },
2740 2746 { PCI_DEVICE_ID_NVIDIA_MCP_AUDIO, "NVidia nForce" },
2741 2747 { PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO, "NVidia nForce2" },