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

[Ben Hutchings]

Author: benh
Date: Mon Nov 15 02:21:45 2010
New Revision: 16552

Log:
[x86] btusb: Add device IDs for MacBookPro 6,2 and 7,1

Added:
   dists/sid/linux-2.6/debian/patches/features/x86/Bluetooth-Add-support-for-MacbookPro-6-2.patch
   dists/sid/linux-2.6/debian/patches/features/x86/Bluetooth-Add-support-for-MacbookPro-7-1.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/28

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Nov 15 02:10:52 2010	(r16551)
+++ dists/sid/linux-2.6/debian/changelog	Mon Nov 15 02:21:45 2010	(r16552)
@@ -34,6 +34,7 @@
   * [powerpc] ALSA: Fix headphone and line-out detection on PowerMac G4 DA
     (Closes: #603419)
   * [x86] snd-hda-codec-cirrus: Add quirks for IMac 27", MacBookPro 5,5 and 7,1
+  * [x86] btusb: Add device IDs for MacBookPro 6,2 and 7,1
 
   [ dann frazier ]
   * [vserver] Update patch to 2.6.32.25-vs2.3.0.36.29.6

Added: dists/sid/linux-2.6/debian/patches/features/x86/Bluetooth-Add-support-for-MacbookPro-6-2.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/x86/Bluetooth-Add-support-for-MacbookPro-6-2.patch	Mon Nov 15 02:21:45 2010	(r16552)
@@ -0,0 +1,43 @@
+From 9c047157a20521cd525527947b13b950d168d2e6 Mon Sep 17 00:00:00 2001
+From: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Date: Fri, 20 Aug 2010 16:24:06 +0900
+Subject: [PATCH 2/3] Bluetooth: Add support Bluetooth controller of MacbookPro 6,2
+
+Bluetooth controller of MacbookPro 6,2 does not work.
+Because Device Class of these controllers was set 255 (Vendor Sepecific Class).
+
+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: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Acked-by: Marcel Holtmann <marcel at holtmann.org>
+Signed-off-by: Gustavo F. Padovan <padovan at profusion.mobi>
+---
+ 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..d1bb809 100644
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -62,6 +62,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
+

Added: dists/sid/linux-2.6/debian/patches/features/x86/Bluetooth-Add-support-for-MacbookPro-7-1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/x86/Bluetooth-Add-support-for-MacbookPro-7-1.patch	Mon Nov 15 02:21:45 2010	(r16552)
@@ -0,0 +1,44 @@
+From 3cd01976e702ccaffb907727caff4f8789353599 Mon Sep 17 00:00:00 2001
+From: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Date: Fri, 20 Aug 2010 16:24:07 +0900
+Subject: [PATCH 3/3] Bluetooth: Add support Bluetooth controller of MacbookPro 7,1
+
+Bluetooth controller of MacbookPro 7,1 does not work.
+Because Device Class of these controllers was set 255 (Vendor Sepecific Class).
+
+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=5C5948C81B99
+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: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Acked-by: Marcel Holtmann <marcel at holtmann.org>
+Signed-off-by: Gustavo F. Padovan <padovan at profusion.mobi>
+---
+ 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 d1bb809..d120a5c 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 MacBookPro 7,1 */
++	{ USB_DEVICE(0x05ac, 0x8213) },
++
+ 	/* Apple iMac11,1 */
+ 	{ USB_DEVICE(0x05ac, 0x8215) },
+ 
+-- 
+1.7.2.3
+

Modified: dists/sid/linux-2.6/debian/patches/series/28
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/28	Mon Nov 15 02:10:52 2010	(r16551)
+++ dists/sid/linux-2.6/debian/patches/series/28	Mon Nov 15 02:21:45 2010	(r16552)
@@ -22,3 +22,6 @@
 + features/x86/ALSA-hda-Add-support-for-the-new-27-inch-IMacs.patch
 + features/x86/ALSA-hda-MacBookPro-5-3-line-in-support.patch
 + features/x86/ALSA-hda-Add-model-mbp55-entry-for-MacBookPro-7-1.patch
++ features/x86/ALSA-hda-MacBookAir3-1-3-2-alsa-support.patch
++ features/x86/Bluetooth-Add-support-for-MacbookPro-6-2.patch
++ features/x86/Bluetooth-Add-support-for-MacbookPro-7-1.patch