[kernel] r19425 - in dists/squeeze/linux-2.6/debian: . patches/features/x86 patches/series

[Ben Hutchings]

Author: benh
Date: Wed Oct 10 01:26:56 2012
New Revision: 19425

Log:
[x86] ALSA: hda_intel: Add class ID for Intel chips

Added:
   dists/squeeze/linux-2.6/debian/patches/features/x86/ALSA-hda-Reduce-pci-id-list-for-Intel-with-class-id.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/47

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Tue Oct  9 05:34:32 2012	(r19424)
+++ dists/squeeze/linux-2.6/debian/changelog	Wed Oct 10 01:26:56 2012	(r19425)
@@ -1,8 +1,9 @@
 linux-2.6 (2.6.32-47) UNRELEASED; urgency=low
 
   [ Ben Hutchings ]
-  * [x86] ALSA: hda_intel: Add device IDs for Intel Patsburg, Vortex86MX,
-    VMware and Intel Panther Point (Closes: #689928)
+  * [x86] ALSA: hda_intel: Add device/class IDs for Intel Patsburg,
+    Vortex86MX, VMware, Intel Panther Point and other Intel chips
+    (Closes: #689928)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 08 Oct 2012 00:26:11 +0100
 

Added: dists/squeeze/linux-2.6/debian/patches/features/x86/ALSA-hda-Reduce-pci-id-list-for-Intel-with-class-id.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/features/x86/ALSA-hda-Reduce-pci-id-list-for-Intel-with-class-id.patch	Wed Oct 10 01:26:56 2012	(r19425)
@@ -0,0 +1,51 @@
+From: Takashi Iwai <tiwai at suse.de>
+Date: Wed, 15 Sep 2010 10:17:26 +0200
+Subject: ALSA: hda - Reduce pci id list for Intel with class id
+
+commit b686453543fd56332e8730a2abd7bf5bca756149 upstream.
+
+Most of Intel controllers work as generic HD-audio without quirks,
+and it'll be hopefully so in future.  Let's mark pci id with the
+PCI_CLASS_MULTIMEDIA_HD_AUDIO for Intel so that the driver will work
+with any new control chips in future.
+
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
+---
+ sound/pci/hda/hda_intel.c |   18 +++++-------------
+ 1 file changed, 5 insertions(+), 13 deletions(-)
+
+diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
+index 34940a0..5f6f903 100644
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -2735,25 +2735,17 @@ static void __devexit azx_remove(struct pci_dev *pci)
+ 
+ /* PCI IDs */
+ static struct pci_device_id azx_ids[] = {
+-	/* ICH 6..10 */
+-	{ PCI_DEVICE(0x8086, 0x2668), .driver_data = AZX_DRIVER_ICH },
+-	{ PCI_DEVICE(0x8086, 0x27d8), .driver_data = AZX_DRIVER_ICH },
+-	{ PCI_DEVICE(0x8086, 0x269a), .driver_data = AZX_DRIVER_ICH },
+-	{ PCI_DEVICE(0x8086, 0x284b), .driver_data = AZX_DRIVER_ICH },
+-	{ PCI_DEVICE(0x8086, 0x2911), .driver_data = AZX_DRIVER_ICH },
+-	{ PCI_DEVICE(0x8086, 0x293e), .driver_data = AZX_DRIVER_ICH },
+-	{ PCI_DEVICE(0x8086, 0x293f), .driver_data = AZX_DRIVER_ICH },
+-	{ PCI_DEVICE(0x8086, 0x3a3e), .driver_data = AZX_DRIVER_ICH },
+-	{ PCI_DEVICE(0x8086, 0x3a6e), .driver_data = AZX_DRIVER_ICH },
+-	/* PCH */
+-	{ PCI_DEVICE(0x8086, 0x3b56), .driver_data = AZX_DRIVER_ICH },
+-	{ PCI_DEVICE(0x8086, 0x3b57), .driver_data = AZX_DRIVER_ICH },
+ 	/* CPT */
+ 	{ PCI_DEVICE(0x8086, 0x1c20), .driver_data = AZX_DRIVER_PCH },
+ 	/* PBG */
+ 	{ PCI_DEVICE(0x8086, 0x1d20), .driver_data = AZX_DRIVER_PCH },
+ 	/* SCH */
+ 	{ PCI_DEVICE(0x8086, 0x811b), .driver_data = AZX_DRIVER_SCH },
++	/* Generic Intel */
++	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_ANY_ID),
++	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
++	  .class_mask = 0xffffff,
++	  .driver_data = AZX_DRIVER_ICH },
+ 	/* ATI SB 450/600 */
+ 	{ PCI_DEVICE(0x1002, 0x437b), .driver_data = AZX_DRIVER_ATI },
+ 	{ PCI_DEVICE(0x1002, 0x4383), .driver_data = AZX_DRIVER_ATI },

Modified: dists/squeeze/linux-2.6/debian/patches/series/47
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/47	Tue Oct  9 05:34:32 2012	(r19424)
+++ dists/squeeze/linux-2.6/debian/patches/series/47	Wed Oct 10 01:26:56 2012	(r19425)
@@ -1,4 +1,5 @@
 + features/x86/ALSA-hda_intel-ALSA-HD-Audio-patch-for-Intel-Patsbur.patch
++ features/x86/ALSA-hda-Reduce-pci-id-list-for-Intel-with-class-id.patch
 + features/x86/ALSA-hda-add-Vortex86MX-PCI-ids.patch
 + features/x86/ALSA-hda-Add-support-for-VMware-controller.patch
 + features/x86/ALSA-HD-Audio-patch-for-Intel-Panther-Point.patch