summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2012-10-09 16:01:19 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2012-10-10 11:25:08 -0400
commit4e04c884690abce71db717fe5eccd4fb9048bd14 (patch)
tree9a783692fadbf139e6598afee40668be4c1a1f7b
parentdfe713a1e403e896a8f79f172f970024ad81a3cf (diff)
downloadlongterm-queue-2.6.34-4e04c884690abce71db717fe5eccd4fb9048bd14.tar.gz
add ALSA device IDs patches
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/ALSA-hda-ALSA-HD-Audio-patch-for-Intel-Panther-Point.patch40
-rw-r--r--queue/ALSA-hda-Add-support-for-VMware-controller.patch35
-rw-r--r--queue/ALSA-hda-Reduce-pci-id-list-for-Intel-with-class-id.patch56
-rw-r--r--queue/ALSA-hda-Use-position_fix-1-for-Acer-Aspire-5538-to-.patch37
-rw-r--r--queue/ALSA-hda-add-Vortex86MX-PCI-ids.patch30
-rw-r--r--queue/ALSA-hda_intel-ALSA-HD-Audio-patch-for-Intel-Patsbur.patch41
-rw-r--r--queue/series6
7 files changed, 245 insertions, 0 deletions
diff --git a/queue/ALSA-hda-ALSA-HD-Audio-patch-for-Intel-Panther-Point.patch b/queue/ALSA-hda-ALSA-HD-Audio-patch-for-Intel-Panther-Point.patch
new file mode 100644
index 0000000..062beb7
--- /dev/null
+++ b/queue/ALSA-hda-ALSA-HD-Audio-patch-for-Intel-Panther-Point.patch
@@ -0,0 +1,40 @@
+From 5346c5f92d4516d177ecaba224a57d6a2b7f9d6e Mon Sep 17 00:00:00 2001
+From: Seth Heasley <seth.heasley@intel.com>
+Date: Wed, 20 Apr 2011 10:59:57 -0700
+Subject: [PATCH] ALSA: hda - ALSA HD Audio patch for Intel Panther Point
+ DeviceIDs
+
+commit d2edeb7c6f1dada8ca7d5c23e42d604e92ae0c76 upstream.
+
+This patch adds the HD Audio Controller DeviceIDs for the Intel Panther Point PCH.
+
+Signed-off-by: Seth Heasley <seth.heasley@intel.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ sound/pci/hda/hda_intel.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
+index 144d41d..2a6c825 100644
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -126,6 +126,7 @@ MODULE_SUPPORTED_DEVICE("{{Intel, ICH6},"
+ "{Intel, ICH10},"
+ "{Intel, PCH},"
+ "{Intel, CPT},"
++ "{Intel, PPT},"
+ "{Intel, PBG},"
+ "{Intel, SCH},"
+ "{ATI, SB450},"
+@@ -2720,6 +2721,8 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
+ { PCI_DEVICE(0x8086, 0x1c20), .driver_data = AZX_DRIVER_PCH },
+ /* PBG */
+ { PCI_DEVICE(0x8086, 0x1d20), .driver_data = AZX_DRIVER_PCH },
++ /* Panther Point */
++ { PCI_DEVICE(0x8086, 0x1e20), .driver_data = AZX_DRIVER_PCH },
+ /* SCH */
+ { PCI_DEVICE(0x8086, 0x811b), .driver_data = AZX_DRIVER_SCH },
+ /* Generic Intel */
+--
+1.7.12.1
+
diff --git a/queue/ALSA-hda-Add-support-for-VMware-controller.patch b/queue/ALSA-hda-Add-support-for-VMware-controller.patch
new file mode 100644
index 0000000..c267de9
--- /dev/null
+++ b/queue/ALSA-hda-Add-support-for-VMware-controller.patch
@@ -0,0 +1,35 @@
+From 83d52996ba5c205e938a4cf69e4d33fb4dd3eb20 Mon Sep 17 00:00:00 2001
+From: Bankim Bhavsar <bbhavsar@vmware.com>
+Date: Mon, 17 Jan 2011 15:23:21 +0100
+Subject: [PATCH] ALSA: hda - Add support for VMware controller
+
+commit 0f0714c5ed0a98fdeaa2287d3b159989bbe6d842 upstream.
+
+Add the new PCI ID 0x15ad and device ID 0x1977 for VMware HDAudio
+Controller.
+
+[changed to use AZX_DRIVER_GENERIC by tiwai]
+
+Signed-off-by: Bankim Bhavsar <bbhavsar@vmware.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+---
+ sound/pci/hda/hda_intel.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
+index d003298..a1a1e82 100644
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -2782,6 +2782,8 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
+ #endif
+ /* Vortex86MX */
+ { PCI_DEVICE(0x17f3, 0x3010), .driver_data = AZX_DRIVER_GENERIC },
++ /* VMware HDAudio */
++ { PCI_DEVICE(0x15ad, 0x1977), .driver_data = AZX_DRIVER_GENERIC },
+ /* AMD/ATI 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,
+--
+1.7.12.1
+
diff --git a/queue/ALSA-hda-Reduce-pci-id-list-for-Intel-with-class-id.patch b/queue/ALSA-hda-Reduce-pci-id-list-for-Intel-with-class-id.patch
new file mode 100644
index 0000000..64b8282
--- /dev/null
+++ b/queue/ALSA-hda-Reduce-pci-id-list-for-Intel-with-class-id.patch
@@ -0,0 +1,56 @@
+From 98c4975aee629e9442e1f4cb9b451a61ff8b97de Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Wed, 15 Sep 2010 10:17:26 +0200
+Subject: [PATCH] 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@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+---
+ 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 a1a1e82..144d41d 100644
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -2716,25 +2716,17 @@ static void __devexit azx_remove(struct pci_dev *pci)
+
+ /* PCI IDs */
+ static DEFINE_PCI_DEVICE_TABLE(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 },
+--
+1.7.12.1
+
diff --git a/queue/ALSA-hda-Use-position_fix-1-for-Acer-Aspire-5538-to-.patch b/queue/ALSA-hda-Use-position_fix-1-for-Acer-Aspire-5538-to-.patch
new file mode 100644
index 0000000..be1bb97
--- /dev/null
+++ b/queue/ALSA-hda-Use-position_fix-1-for-Acer-Aspire-5538-to-.patch
@@ -0,0 +1,37 @@
+From 3648caa9b4034d5050cdc56aec1cd67cfd17cf81 Mon Sep 17 00:00:00 2001
+From: Daniel T Chen <crimsun@ubuntu.com>
+Date: Sun, 5 Dec 2010 08:43:14 -0500
+Subject: [PATCH] ALSA: hda: Use position_fix=1 for Acer Aspire 5538 to enable
+ capture on internal mic
+
+commit dd5a089edfa51a74692604b4b427953d8e16bc35 upstream.
+
+BugLink: https://launchpad.net/bugs/685161
+
+The reporter of the bug states that he must use position_fix=1 to enable
+capture for the internal microphone, so set it for his machine's PCI
+SSID. Verified using 2.6.35 and the 2010-12-04 alsa-driver build.
+
+Reported-and-tested-by: Ralph Wabel <rwabel@gmx.net>
+Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+---
+ sound/pci/hda/hda_intel.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
+index 2a6c825..3a532c8 100644
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -2266,6 +2266,7 @@ static int azx_dev_free(struct snd_device *device)
+ */
+ static struct snd_pci_quirk position_fix_list[] __devinitdata = {
+ SND_PCI_QUIRK(0x1025, 0x009f, "Acer Aspire 5110", POS_FIX_LPIB),
++ SND_PCI_QUIRK(0x1025, 0x026f, "Acer Aspire 5538", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_LPIB),
+ SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB),
+--
+1.7.12.1
+
diff --git a/queue/ALSA-hda-add-Vortex86MX-PCI-ids.patch b/queue/ALSA-hda-add-Vortex86MX-PCI-ids.patch
new file mode 100644
index 0000000..28966e0
--- /dev/null
+++ b/queue/ALSA-hda-add-Vortex86MX-PCI-ids.patch
@@ -0,0 +1,30 @@
+From aeb3d3bcfafd7b2a0b87c35d0c4c925e7bd1e6b4 Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Sun, 26 Sep 2010 23:35:06 -0300
+Subject: [PATCH] ALSA: hda: add Vortex86MX PCI ids
+
+commit e35d4b119578a054515ccb4ed5dddc4e8a81ec15 upstream.
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+---
+ sound/pci/hda/hda_intel.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
+index 3072fcf..d003298 100644
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -2780,6 +2780,8 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
+ /* this entry seems still valid -- i.e. without emu20kx chip */
+ { PCI_DEVICE(0x1102, 0x0009), .driver_data = AZX_DRIVER_GENERIC },
+ #endif
++ /* Vortex86MX */
++ { PCI_DEVICE(0x17f3, 0x3010), .driver_data = AZX_DRIVER_GENERIC },
+ /* AMD/ATI 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,
+--
+1.7.12.1
+
diff --git a/queue/ALSA-hda_intel-ALSA-HD-Audio-patch-for-Intel-Patsbur.patch b/queue/ALSA-hda_intel-ALSA-HD-Audio-patch-for-Intel-Patsbur.patch
new file mode 100644
index 0000000..fb86594
--- /dev/null
+++ b/queue/ALSA-hda_intel-ALSA-HD-Audio-patch-for-Intel-Patsbur.patch
@@ -0,0 +1,41 @@
+From ee5f63c453f98863511ae0f42965311869cb1542 Mon Sep 17 00:00:00 2001
+From: Seth Heasley <seth.heasley@intel.com>
+Date: Fri, 10 Sep 2010 16:29:56 -0700
+Subject: [PATCH] ALSA: hda_intel: ALSA HD Audio patch for Intel Patsburg
+ DeviceIDs
+
+commit cea310e8f8702226f982f09386cfd3c5793c5e2f upstream.
+
+This patch adds the Intel Patsburg (PCH) HD Audio Controller DeviceIDs.
+
+Signed-off-by: Seth Heasley <seth.heasley@intel.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+---
+ sound/pci/hda/hda_intel.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
+index 3cf21ff..3072fcf 100644
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -126,6 +126,7 @@ MODULE_SUPPORTED_DEVICE("{{Intel, ICH6},"
+ "{Intel, ICH10},"
+ "{Intel, PCH},"
+ "{Intel, CPT},"
++ "{Intel, PBG},"
+ "{Intel, SCH},"
+ "{ATI, SB450},"
+ "{ATI, SB600},"
+@@ -2730,6 +2731,8 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
+ { 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 },
+ /* ATI SB 450/600 */
+--
+1.7.12.1
+
diff --git a/queue/series b/queue/series
index 2d61e0c..53d8ba9 100644
--- a/queue/series
+++ b/queue/series
@@ -2,3 +2,9 @@ net-sock-validate-data_len-before-allocating-skb-in-.patch
time-Improve-sanity-checking-of-timekeeping-inputs.patch
time-Avoid-making-adjustments-if-we-haven-t-accumula.patch
time-Move-ktime_t-overflow-checking-into-timespec_va.patch
+ALSA-hda_intel-ALSA-HD-Audio-patch-for-Intel-Patsbur.patch
+ALSA-hda-add-Vortex86MX-PCI-ids.patch
+ALSA-hda-Add-support-for-VMware-controller.patch
+ALSA-hda-Reduce-pci-id-list-for-Intel-with-class-id.patch
+ALSA-hda-ALSA-HD-Audio-patch-for-Intel-Panther-Point.patch
+ALSA-hda-Use-position_fix-1-for-Acer-Aspire-5538-to-.patch