From c9364d098252e08c68eac71bdf268a6af2fff5ba Mon Sep 17 00:00:00 2001
From: "Yang, Libin" <Libin.Yang@amd.com>
Date: Thu, 13 Nov 2008 11:07:07 +0100
Subject: [PATCH] --- yaml --- r: 120447 b: refs/heads/master c:
 c4da29ca08e09ed41a2030c1f7b5860f116573be h: refs/heads/master i:   120445:
 c9cf8e766338b94e77a81a9587d17f56b9289f1e   120443:
 11d0b9eb47d3f607fe173e0ef5432ce971dce768   120439:
 78b2feb636ae1f32462e961fe3a6a252cc6931df   120431:
 67a98c0c316640621c51c967763274c0c9ac343e   120415:
 4b9e3582dff1d978436e7a6ae747984f5e0e8a97   120383:
 e33a536f6e29e57702798c0548b2b59d0b941c8e   120319:
 e3a4434cffc07c13b2d2231387676e9852bfe484 v: v3

---
 [refs]                          |  2 +-
 trunk/sound/pci/hda/hda_intel.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1f98be5b0cff..a95e4141dd3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a95cb972bb0eb80dfdb42f11628e6d58bcdde29
+refs/heads/master: c4da29ca08e09ed41a2030c1f7b5860f116573be
diff --git a/trunk/sound/pci/hda/hda_intel.c b/trunk/sound/pci/hda/hda_intel.c
index 3e112df1c0dc..f73c13fdd409 100644
--- a/trunk/sound/pci/hda/hda_intel.c
+++ b/trunk/sound/pci/hda/hda_intel.c
@@ -292,6 +292,8 @@ enum {
 /* Define VIA HD Audio Device ID*/
 #define VIA_HDAC_DEVICE_ID		0x3288
 
+/* HD Audio class code */
+#define PCI_CLASS_MULTIMEDIA_HD_AUDIO	0x0403
 
 /*
  */
@@ -415,6 +417,7 @@ enum {
 	AZX_DRIVER_ULI,
 	AZX_DRIVER_NVIDIA,
 	AZX_DRIVER_TERA,
+	AZX_DRIVER_GENERIC,
 	AZX_NUM_DRIVERS, /* keep this as last entry */
 };
 
@@ -428,6 +431,7 @@ static char *driver_short_names[] __devinitdata = {
 	[AZX_DRIVER_ULI] = "HDA ULI M5461",
 	[AZX_DRIVER_NVIDIA] = "HDA NVidia",
 	[AZX_DRIVER_TERA] = "HDA Teradici", 
+	[AZX_DRIVER_GENERIC] = "HD-Audio Generic",
 };
 
 /*
@@ -2203,6 +2207,7 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
 			chip->playback_streams = ATIHDMI_NUM_PLAYBACK;
 			chip->capture_streams = ATIHDMI_NUM_CAPTURE;
 			break;
+		case AZX_DRIVER_GENERIC:
 		default:
 			chip->playback_streams = ICH6_NUM_PLAYBACK;
 			chip->capture_streams = ICH6_NUM_CAPTURE;
@@ -2427,6 +2432,11 @@ static struct pci_device_id azx_ids[] = {
 	{ PCI_DEVICE(0x10de, 0x0bd7), .driver_data = AZX_DRIVER_NVIDIA },
 	/* Teradici */
 	{ PCI_DEVICE(0x6549, 0x1200), .driver_data = AZX_DRIVER_TERA },
+	/* AMD Generic, PCI class code and Vendor ID for HD Audio */
+	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID),
+	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
+	  .class_mask = 0xffffff,
+	  .driver_data = AZX_DRIVER_GENERIC },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, azx_ids);