[kernel/f17] Add ALSA quirk for MacPro 5,1 machines (rhbz 808559)

[Josh Boyer]

commit aca0c0113c8796e6013e2be49633adb93bb2f575
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Sat Apr 14 09:23:39 2012 -0400

    Add ALSA quirk for MacPro 5,1 machines (rhbz 808559)

 ...ealtek-Add-quirk-for-Mac-Pro-5-1-machines.patch |   37 ++++++++++++++++++++
 kernel.spec                                        |   11 +++++-
 2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/ALSA-hda-realtek-Add-quirk-for-Mac-Pro-5-1-machines.patch b/ALSA-hda-realtek-Add-quirk-for-Mac-Pro-5-1-machines.patch
new file mode 100644
index 0000000..28579d1
--- /dev/null
+++ b/ALSA-hda-realtek-Add-quirk-for-Mac-Pro-5-1-machines.patch
@@ -0,0 +1,37 @@
+From a9e1e167d934aa74f48008393ade4f09fc587432 Mon Sep 17 00:00:00 2001
+From: Josh Boyer <jwboyer at redhat.com>
+Date: Thu, 12 Apr 2012 13:55:36 -0400
+Subject: [PATCH] ALSA: hda/realtek - Add quirk for Mac Pro 5,1 machines
+
+A user reported that setting model=imac24 used to allow sound to work on their
+Mac Pro 5,1 machine.  Commit 5671087ffa "Move ALC885 macpro and imac24 models
+to auto-parser" removed this model option.  All Mac machines are now explicitly
+handled with a quirk and the auto-parser.  This adds a quirk for the device
+found on the Mac Pro 5,1 machines.
+
+This (partially) fixes https://bugzilla.redhat.com/show_bug.cgi?id=808559
+
+[sorted the new entry in the ID number order by tiwai]
+
+Reported-by: Gabriel Somlo <somlo at cmu.edu>
+Signed-off-by: Josh Boyer <jwboyer at redhat.com>
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
+---
+ sound/pci/hda/patch_realtek.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
+index 22c73b7..bd34b51 100644
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -4659,6 +4659,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {
+ 	SND_PCI_QUIRK(0x106b, 0x2800, "AppleTV", ALC885_FIXUP_MACPRO_GPIO),
+ 	SND_PCI_QUIRK(0x106b, 0x3200, "iMac 7,1 Aluminum", ALC882_FIXUP_EAPD),
+ 	SND_PCI_QUIRK(0x106b, 0x3e00, "iMac 24 Aluminum", ALC885_FIXUP_MACPRO_GPIO),
++	SND_PCI_QUIRK(0x106b, 0x4200, "Mac Pro 5,1", ALC885_FIXUP_MACPRO_GPIO),
+ 
+ 	SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC882_FIXUP_EAPD),
+ 	SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3),
+-- 
+1.7.7.6
+
diff --git a/kernel.spec b/kernel.spec
index 1df7ce9..b9070c4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -782,6 +782,9 @@ Patch21400: unhandled-irqs-switch-to-polling.patch
 #rhbz 808207 CVE-2012-1601
 Patch21520: KVM-Ensure-all-vcpus-are-consistent-with-in-kernel-i.patch
 
+#rhbz 808559
+Patch21530: ALSA-hda-realtek-Add-quirk-for-Mac-Pro-5-1-machines.patch
+
 Patch22000: weird-root-dentry-name-debug.patch
 
 #selinux ptrace child permissions
@@ -1386,6 +1389,9 @@ ApplyPatch linux-2.6-defaults-aspm.patch
 
 # ALSA
 
+#rhbz 808559
+ApplyPatch ALSA-hda-realtek-Add-quirk-for-Mac-Pro-5-1-machines.patch
+
 # Networking
 
 # Misc fixes
@@ -2366,6 +2372,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Sat Apr 14 2012 Josh Boyer <jwboyer at redhat.com>
+- Add ALSA quirk for MacPro 5,1 machines (rhbz 808559)
+
 * Fri Apr 13 2012 Josh Boyer <jwboyer at redhat.com> - 3.3.2-1
 - Linux 3.3.2