[kernel/f14/master] Add new btusb ids for MacBookPro from wwoods@

[Kyle McMartin]

commit 027325ab5323d32206e91dbb5c71ddbbc7bef1f4
Author: Kyle McMartin <kyle at dreadnought.i.jkkm.org>
Date:   Tue Sep 21 11:30:59 2010 -0400

    Add new btusb ids for MacBookPro from wwoods@

 btusb-macbookpro-6-2.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 btusb-macbookpro-7-1.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 kernel.spec                |    9 +++++++++
 3 files changed, 92 insertions(+), 0 deletions(-)
---
diff --git a/btusb-macbookpro-6-2.patch b/btusb-macbookpro-6-2.patch
new file mode 100644
index 0000000..d65a309
--- /dev/null
+++ b/btusb-macbookpro-6-2.patch
@@ -0,0 +1,41 @@
+From kernel-bounces at lists.fedoraproject.org Fri Sep 17 17:09:15 2010
+From: Will Woods <wwoods at redhat.com>
+To: Marcel Holtmann <marcel at holtmann.org>
+Subject: [PATCH 2/2] bluetooth: add support for controller in MacBookPro6,2
+Date: Fri, 17 Sep 2010 17:09:21 -0400
+
+Once again the device class is ff(vend.) instead of e0(wlcon).
+
+output from 'usb-devices':
+T:  Bus=01 Lev=03 Prnt=03 Port=02 Cnt=03 Dev#=  8 Spd=12  MxCh= 0
+D:  Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
+P:  Vendor=05ac ProdID=8218 Rev=00.22
+S:  Manufacturer=Apple Inc.
+S:  Product=Bluetooth USB Host Controller
+C:  #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=0mA
+I:  If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none)
+I:  If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=(none)
+I:  If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
+I:  If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none)
+
+Signed-off-by: Will Woods <wwoods at redhat.com>
+---
+ drivers/bluetooth/btusb.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
+index eac44e4..320e798 100644
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -65,6 +65,9 @@ static struct usb_device_id btusb_table[] = {
+ 	/* Apple iMac11,1 */
+ 	{ USB_DEVICE(0x05ac, 0x8215) },
+ 
++	/* Apple MacBookPro6,2 */
++	{ USB_DEVICE(0x05ac, 0x8218) },
++
+ 	/* AVM BlueFRITZ! USB v2.0 */
+ 	{ USB_DEVICE(0x057c, 0x3800) },
+ 
+-- 
+1.7.2.3
diff --git a/btusb-macbookpro-7-1.patch b/btusb-macbookpro-7-1.patch
new file mode 100644
index 0000000..3e07dd5
--- /dev/null
+++ b/btusb-macbookpro-7-1.patch
@@ -0,0 +1,42 @@
+From kernel-bounces at lists.fedoraproject.org Fri Sep 17 17:09:18 2010
+From: Will Woods <wwoods at redhat.com>
+To: Marcel Holtmann <marcel at holtmann.org>
+Subject: [PATCH 1/2] bluetooth: add support for controller in MacBookPro7,1
+Date: Fri, 17 Sep 2010 17:09:20 -0400
+
+As with iMac11,1 the device class is ff(vend.) instead of e0(wlcon).
+
+output from 'usb-devices':
+T:  Bus=04 Lev=02 Prnt=04 Port=00 Cnt=01 Dev#=  5 Spd=12  MxCh= 0
+D:  Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
+P:  Vendor=05ac ProdID=8213 Rev=01.86
+S:  Manufacturer=Apple Inc.
+S:  Product=Bluetooth USB Host Controller
+S:  SerialNumber=58B0359C28ED
+C:  #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=0mA
+I:  If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
+I:  If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+I:  If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
+I:  If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=00 Driver=(none)
+
+Signed-off-by: Will Woods <wwoods at redhat.com>
+---
+ drivers/bluetooth/btusb.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
+index d22ce3c..eac44e4 100644
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -59,6 +59,9 @@ static struct usb_device_id btusb_table[] = {
+ 	/* Generic Bluetooth USB device */
+ 	{ USB_DEVICE_INFO(0xe0, 0x01, 0x01) },
+ 
++	/* Apple MacBookPro7,1 */
++	{ USB_DEVICE(0x05ac, 0x8213) },
++
+ 	/* Apple iMac11,1 */
+ 	{ USB_DEVICE(0x05ac, 0x8215) },
+ 
+-- 
+1.7.2.3
diff --git a/kernel.spec b/kernel.spec
index 62004ac..8c8d920 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -749,6 +749,9 @@ Patch12575: sched-15-update-rq-clock-for-nohz-balanced-cpus.patch
 Patch12580: sched-20-fix-rq-clock-synchronization-when-migrating-tasks.patch
 Patch12585: sched-25-move-sched_avg_update-to-update_cpu_load.patch
 
+Patch13600: btusb-macbookpro-6-2.patch
+Patch13601: btusb-macbookpro-7-1.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1386,6 +1389,9 @@ ApplyPatch sched-15-update-rq-clock-for-nohz-balanced-cpus.patch
 ApplyPatch sched-20-fix-rq-clock-synchronization-when-migrating-tasks.patch
 ApplyPatch sched-25-move-sched_avg_update-to-update_cpu_load.patch
 
+ApplyPatch btusb-macbookpro-7-1.patch
+ApplyPatch btusb-macbookpro-6-2.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1972,6 +1978,9 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 21 2010 Kyle McMartin <kyle at redhat.com>
+- Add new btusb ids for MacBookPro from wwoods at .
+
 * Tue Sep 21 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.35.5-29
 - Scheduler fixes for Bugzilla #635813 and #633037