mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Andrew Chew" <achew@nvidia.com>
To: <linux-kernel@vger.kernel.org>
Cc: <jgarzik@pobox.com>
Subject: [PATCH 2.6.8-rc2] intel8x0.c to include CK804 audio support
Date: Wed, 21 Jul 2004 19:08:07 -0700	[thread overview]
Message-ID: <DBFABB80F7FD3143A911F9E6CFD477B03F95DD@hqemmail02.nvidia.com> (raw)

This patch updates include/linux/pci_ids.h with the CK804 audio
controller ID, and adds the CK804 audio controller to the
sound/pci/intel8x0.c audio driver.

--- linux-2.6.8-rc2/include/linux/pci_ids.h	2004-07-21
15:22:57.000000000 -0700
+++ linux/include/linux/pci_ids.h	2004-07-20 18:49:22.000000000
-0700
@@ -1071,6 +1071,7 @@
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2	0x0055
 #define PCI_DEVICE_ID_NVIDIA_NVENET_8		0x0056
 #define PCI_DEVICE_ID_NVIDIA_NVENET_9		0x0057
+#define PCI_DEVICE_ID_NVIDIA_CK804_AUDIO	0x0059
 #define PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE	0x0065
 #define PCI_DEVICE_ID_NVIDIA_NVENET_2		0x0066
 #define PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO		0x006a
--- linux-2.6.8-rc2/sound/pci/intel8x0.c	2004-07-21
15:22:59.000000000 -0700
+++ linux/sound/pci/intel8x0.c	2004-07-20 18:52:07.000000000 -0700
@@ -155,6 +155,9 @@
 #ifndef PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO
 #define PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO	0x00ea
 #endif
+#ifndef PCI_DEVICE_ID_NVIDIA_CK804_AUDIO
+#define PCI_DEVICE_ID_NVIDIA_CK804_AUDIO 0x0059
+#endif
 
 enum { DEVICE_INTEL, DEVICE_INTEL_ICH4, DEVICE_SIS, DEVICE_ALI,
DEVICE_NFORCE };
 
@@ -465,6 +468,7 @@
 	{ 0x10de, 0x006a, 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 */
 	{ 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 */
@@ -2614,6 +2618,7 @@
 	{ PCI_DEVICE_ID_NVIDIA_MCP2_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" },
 	{ 0x746d, "AMD AMD8111" },
 	{ 0x7445, "AMD AMD768" },
 	{ 0x5455, "ALi M5455" },

             reply	other threads:[~2004-07-22  2:08 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-07-22  2:08 Andrew Chew [this message]
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
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-29  0:13 Andrew Chew
2004-07-29 13:31 ` Takashi Iwai

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=DBFABB80F7FD3143A911F9E6CFD477B03F95DD@hqemmail02.nvidia.com \
    --to=achew@nvidia.com \
    --cc=jgarzik@pobox.com \
    --cc=linux-kernel@vger.kernel.org \
    /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®