* [PATCH 2.6.11.6 3/6] intel8x0: AC'97 audio patch for Intel ESB2
@ 2005-04-05 15:10 Jason Gaston
2005-04-05 20:01 ` Jeff Garzik
0 siblings, 1 reply; 3+ messages in thread
From: Jason Gaston @ 2005-04-05 15:10 UTC (permalink / raw)
To: perex, tiwai; +Cc: linux-kernel, jason.d.gaston
Hello,
This patch adds the Intel ESB2 DID's to the intel8x0.c file for AC'97 audio support. This patch was built against the 2.6.11.6 kernel.
If acceptable, please apply. Note: This patch depends on the previous 1/6 patch for pci_ids.h
Thanks,
Jason Gaston
Signed-off-by: Jason Gaston <Jason.d.gaston@intel.com>
--- linux-2.6.11.6/sound/pci/intel8x0.c.orig 2005-03-28 09:29:48.611042184 -0800
+++ linux-2.6.11.6/sound/pci/intel8x0.c 2005-03-28 09:32:49.771501608 -0800
@@ -55,6 +55,7 @@
"{Intel,ICH6},"
"{Intel,ICH7},"
"{Intel,6300ESB},"
+ "{Intel,ESB2},"
"{Intel,MX440},"
"{SiS,SI7012},"
"{NVidia,nForce Audio},"
@@ -124,6 +125,9 @@
#ifndef PCI_DEVICE_ID_INTEL_ICH7_20
#define PCI_DEVICE_ID_INTEL_ICH7_20 0x27de
#endif
+#ifndef PCI_DEVICE_ID_INTEL_ESB2_13
+#define PCI_DEVICE_ID_INTEL_ESB2_13 0x2698
+#endif
#ifndef PCI_DEVICE_ID_SI_7012
#define PCI_DEVICE_ID_SI_7012 0x7012
#endif
@@ -443,6 +447,7 @@
{ 0x8086, 0x25a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ESB */
{ 0x8086, 0x266e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH6 */
{ 0x8086, 0x27de, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH7 */
+ { 0x8086, 0x2698, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ESB2 */
{ 0x8086, 0x7195, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 440MX */
{ 0x1039, 0x7012, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_SIS }, /* SI7012 */
{ 0x10de, 0x01b1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE */
@@ -2715,6 +2720,7 @@
{ PCI_DEVICE_ID_INTEL_ESB_5, "Intel 6300ESB" },
{ PCI_DEVICE_ID_INTEL_ICH6_3, "Intel ICH6" },
{ PCI_DEVICE_ID_INTEL_ICH7_20, "Intel ICH7" },
+ { PCI_DEVICE_ID_INTEL_ESB2_13, "Intel ESB2" },
{ PCI_DEVICE_ID_SI_7012, "SiS SI7012" },
{ PCI_DEVICE_ID_NVIDIA_MCP_AUDIO, "NVidia nForce" },
{ PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO, "NVidia nForce2" },
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2.6.11.6 3/6] intel8x0: AC'97 audio patch for Intel ESB2
2005-04-05 15:10 [PATCH 2.6.11.6 3/6] intel8x0: AC'97 audio patch for Intel ESB2 Jason Gaston
@ 2005-04-05 20:01 ` Jeff Garzik
2005-04-06 16:00 ` Takashi Iwai
0 siblings, 1 reply; 3+ messages in thread
From: Jeff Garzik @ 2005-04-05 20:01 UTC (permalink / raw)
To: perex, tiwai; +Cc: Jason Gaston, linux-kernel
Jason Gaston wrote:
> Hello,
>
> This patch adds the Intel ESB2 DID's to the intel8x0.c file for AC'97 audio support. This patch was built against the 2.6.11.6 kernel.
> If acceptable, please apply. Note: This patch depends on the previous 1/6 patch for pci_ids.h
>
> Thanks,
>
> Jason Gaston
>
> Signed-off-by: Jason Gaston <Jason.d.gaston@intel.com>
>
> --- linux-2.6.11.6/sound/pci/intel8x0.c.orig 2005-03-28 09:29:48.611042184 -0800
> +++ linux-2.6.11.6/sound/pci/intel8x0.c 2005-03-28 09:32:49.771501608 -0800
> @@ -124,6 +125,9 @@
> #ifndef PCI_DEVICE_ID_INTEL_ICH7_20
> #define PCI_DEVICE_ID_INTEL_ICH7_20 0x27de
> #endif
> +#ifndef PCI_DEVICE_ID_INTEL_ESB2_13
> +#define PCI_DEVICE_ID_INTEL_ESB2_13 0x2698
> +#endif
> #ifndef PCI_DEVICE_ID_SI_7012
> #define PCI_DEVICE_ID_SI_7012 0x7012
> #endif
(directed at the ALSA people, not Jason)
These #ifdefs need to be removed from the mainline kernel sources.
Jeff
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2.6.11.6 3/6] intel8x0: AC'97 audio patch for Intel ESB2
2005-04-05 20:01 ` Jeff Garzik
@ 2005-04-06 16:00 ` Takashi Iwai
0 siblings, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2005-04-06 16:00 UTC (permalink / raw)
To: Jeff Garzik; +Cc: perex, Jason Gaston, linux-kernel
At Tue, 05 Apr 2005 16:01:06 -0400,
Jeff Garzik wrote:
>
> Jason Gaston wrote:
> > Hello,
> >
> > This patch adds the Intel ESB2 DID's to the intel8x0.c file for AC'97 audio support. This patch was built against the 2.6.11.6 kernel.
> > If acceptable, please apply. Note: This patch depends on the previous 1/6 patch for pci_ids.h
> >
> > Thanks,
> >
> > Jason Gaston
> >
> > Signed-off-by: Jason Gaston <Jason.d.gaston@intel.com>
> >
> > --- linux-2.6.11.6/sound/pci/intel8x0.c.orig 2005-03-28 09:29:48.611042184 -0800
> > +++ linux-2.6.11.6/sound/pci/intel8x0.c 2005-03-28 09:32:49.771501608 -0800
> > @@ -124,6 +125,9 @@
> > #ifndef PCI_DEVICE_ID_INTEL_ICH7_20
> > #define PCI_DEVICE_ID_INTEL_ICH7_20 0x27de
> > #endif
> > +#ifndef PCI_DEVICE_ID_INTEL_ESB2_13
> > +#define PCI_DEVICE_ID_INTEL_ESB2_13 0x2698
> > +#endif
> > #ifndef PCI_DEVICE_ID_SI_7012
> > #define PCI_DEVICE_ID_SI_7012 0x7012
> > #endif
>
> (directed at the ALSA people, not Jason)
>
> These #ifdefs need to be removed from the mainline kernel sources.
Do you mean to remove all these PCI_DEVICE_ID_* definitions (#ifndef,
#define and #endif) from the driver part and put them in
include/linux/pci_ids.h if not exist?
Takashi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2005-04-06 16:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-04-05 15:10 [PATCH 2.6.11.6 3/6] intel8x0: AC'97 audio patch for Intel ESB2 Jason Gaston
2005-04-05 20:01 ` Jeff Garzik
2005-04-06 16:00 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox