From: "Andrew Chew" <achew@nvidia.com>
To: "Takashi Iwai" <tiwai@suse.de>
Cc: <linux-kernel@vger.kernel.org>
Subject: [PATCH 2.6.8-rc2] intel8x0.c to include CK804 audio support
Date: Wed, 28 Jul 2004 17:13:04 -0700 [thread overview]
Message-ID: <DBFABB80F7FD3143A911F9E6CFD477B03F9600@hqemmail02.nvidia.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 378 bytes --]
I left out support for two other NVIDIA audio controllers in my previous
patch.
Attached is a patch which adds audio support for MCP04 and MCP2S audio
controllers for the intel8x0 audio driver. This patch is to be applied
on top of the one I had previously submitted (so in total, there should
be CK804, MCP04, and MCP2S added to the intel8x0 driver as of
2.6.8-rc2).
[-- Attachment #2: intel8x0.diff2 --]
[-- Type: application/octet-stream, Size: 2631 bytes --]
diff -ru linux-2.6.7-rc2/include/linux/pci_ids.h linux/include/linux/pci_ids.h
--- linux-2.6.7-rc2/include/linux/pci_ids.h 2004-07-28 16:56:36.000000000 -0700
+++ linux/include/linux/pci_ids.h 2004-07-28 16:33:50.000000000 -0700
@@ -1065,6 +1065,7 @@
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA 0x0036
#define PCI_DEVICE_ID_NVIDIA_NVENET_10 0x0037
#define PCI_DEVICE_ID_NVIDIA_NVENET_11 0x0038
+#define PCI_DEVICE_ID_NVIDIA_MCP04_AUDIO 0x003a
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2 0x003e
#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE 0x0053
#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA 0x0054
@@ -1077,6 +1078,7 @@
#define PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO 0x006a
#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE 0x0085
#define PCI_DEVICE_ID_NVIDIA_NVENET_4 0x0086
+#define PCI_DEVICE_ID_NVIDIA_MCP2S_AUDIO 0x008a
#define PCI_DEVICE_ID_NVIDIA_NVENET_5 0x008c
#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA 0x008e
#define PCI_DEVICE_ID_NVIDIA_ITNT2 0x00A0
diff -ru linux-2.6.7-rc2/sound/pci/intel8x0.c linux/sound/pci/intel8x0.c
--- linux-2.6.7-rc2/sound/pci/intel8x0.c 2004-07-28 16:31:28.000000000 -0700
+++ linux/sound/pci/intel8x0.c 2004-07-28 16:34:25.000000000 -0700
@@ -466,9 +466,11 @@
{ 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 */
{ 0x10de, 0x006a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE2 */
+ { 0x10de, 0x008a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE2 */
{ 0x10de, 0x00da, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE3 */
{ 0x10de, 0x00ea, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* CK8S */
{ 0x10de, 0x0059, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* CK804 */
+ { 0x10de, 0x003a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* MCP04 */
{ 0x1022, 0x746d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD8111 */
{ 0x1022, 0x7445, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD768 */
{ 0x10b9, 0x5455, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALI }, /* Ali5455 */
@@ -2616,9 +2618,11 @@
{ PCI_DEVICE_ID_SI_7012, "SiS SI7012" },
{ PCI_DEVICE_ID_NVIDIA_MCP_AUDIO, "NVidia nForce" },
{ PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO, "NVidia nForce2" },
+ { PCI_DEVICE_ID_NVIDIA_MCP2S_AUDIO, "NVidia nForce2" },
{ PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO, "NVidia nForce3" },
{ PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO, "NVidia CK8S" },
{ PCI_DEVICE_ID_NVIDIA_CK804_AUDIO, "NVidia CK804" },
+ { PCI_DEVICE_ID_NVIDIA_MCP04_AUDIO, "NVidia MCP04" },
{ 0x746d, "AMD AMD8111" },
{ 0x7445, "AMD AMD768" },
{ 0x5455, "ALi M5455" },
next reply other threads:[~2004-07-29 0:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-07-29 0:13 Andrew Chew [this message]
2004-07-29 13:31 ` Takashi Iwai
-- strict thread matches above, loose matches on Subject: below --
2004-07-27 0:46 Andrew Chew
2004-07-27 1:06 ` Andrew Morton
2004-07-27 2:09 ` Jeff Garzik
2004-07-28 17:30 ` Takashi Iwai
2004-07-22 2:08 Andrew Chew
2004-07-27 0:38 ` Andrew Morton
2004-07-27 4:27 ` Lee Revell
2004-07-27 4:57 ` Paul Jackson
2004-07-27 6:43 ` Denis Vlasenko
2004-07-27 17:41 ` Lee Revell
2004-07-27 22:05 ` Lee Revell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DBFABB80F7FD3143A911F9E6CFD477B03F9600@hqemmail02.nvidia.com \
--to=achew@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®