Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db18014f authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-upstream' of... 

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
parents c77986c7 668b7b19

Documentation/devices.txt

+1 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ Your cooperation is appreciated. 
		133 = /dev/exttrp	External device trap

		134 = /dev/apm_bios	Advanced Power Management BIOS

		135 = /dev/rtc		Real Time Clock

		137 = /dev/vhci		Bluetooth virtual HCI driver

		139 = /dev/openprom	SPARC OpenBoot PROM

		140 = /dev/relay8	Berkshire Products Octal relay card

		141 = /dev/relay16	Berkshire Products ISO-16 relay card

drivers/bluetooth/ath3k.c

+45 −39
Original line number Diff line number Diff line
@@ -62,50 +62,53 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x0CF3, 0x3000) },



	/* Atheros AR3011 with sflash firmware*/

	{ USB_DEVICE(0x0489, 0xE027) },

	{ USB_DEVICE(0x0489, 0xE03D) },

	{ USB_DEVICE(0x0930, 0x0215) },

	{ USB_DEVICE(0x0CF3, 0x3002) },

	{ USB_DEVICE(0x0CF3, 0xE019) },

	{ USB_DEVICE(0x13d3, 0x3304) },

	{ USB_DEVICE(0x0930, 0x0215) },

	{ USB_DEVICE(0x0489, 0xE03D) },

	{ USB_DEVICE(0x0489, 0xE027) },



	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03F0, 0x311D) },



	/* Atheros AR3012 with sflash firmware*/

	{ USB_DEVICE(0x0CF3, 0x0036) },

	{ USB_DEVICE(0x0CF3, 0x3004) },

	{ USB_DEVICE(0x0CF3, 0x3008) },

	{ USB_DEVICE(0x0CF3, 0x311D) },

	{ USB_DEVICE(0x0CF3, 0x817a) },

	{ USB_DEVICE(0x13d3, 0x3375) },

	{ USB_DEVICE(0x0489, 0xe04d) },

	{ USB_DEVICE(0x0489, 0xe04e) },

	{ USB_DEVICE(0x0489, 0xe057) },

	{ USB_DEVICE(0x0489, 0xe056) },

	{ USB_DEVICE(0x0489, 0xe05f) },

	{ USB_DEVICE(0x04c5, 0x1330) },

	{ USB_DEVICE(0x04CA, 0x3004) },

	{ USB_DEVICE(0x04CA, 0x3005) },

	{ USB_DEVICE(0x04CA, 0x3006) },

	{ USB_DEVICE(0x04CA, 0x3008) },

	{ USB_DEVICE(0x04CA, 0x300b) },

	{ USB_DEVICE(0x13d3, 0x3362) },

	{ USB_DEVICE(0x0CF3, 0xE004) },

	{ USB_DEVICE(0x0CF3, 0xE005) },

	{ USB_DEVICE(0x0930, 0x0219) },

	{ USB_DEVICE(0x0930, 0x0220) },

	{ USB_DEVICE(0x0489, 0xe057) },

	{ USB_DEVICE(0x13d3, 0x3393) },

	{ USB_DEVICE(0x0489, 0xe04e) },

	{ USB_DEVICE(0x0489, 0xe056) },

	{ USB_DEVICE(0x0489, 0xe04d) },

	{ USB_DEVICE(0x04c5, 0x1330) },

	{ USB_DEVICE(0x13d3, 0x3402) },

	{ USB_DEVICE(0x0b05, 0x17d0) },

	{ USB_DEVICE(0x0CF3, 0x0036) },

	{ USB_DEVICE(0x0CF3, 0x3004) },

	{ USB_DEVICE(0x0CF3, 0x3008) },

	{ USB_DEVICE(0x0CF3, 0x311D) },

	{ USB_DEVICE(0x0CF3, 0x311E) },

	{ USB_DEVICE(0x0CF3, 0x311F) },

	{ USB_DEVICE(0x0cf3, 0x3121) },

	{ USB_DEVICE(0x0CF3, 0x817a) },

	{ USB_DEVICE(0x0cf3, 0xe003) },

	{ USB_DEVICE(0x0489, 0xe05f) },

	{ USB_DEVICE(0x0CF3, 0xE004) },

	{ USB_DEVICE(0x0CF3, 0xE005) },

	{ USB_DEVICE(0x13d3, 0x3362) },

	{ USB_DEVICE(0x13d3, 0x3375) },

	{ USB_DEVICE(0x13d3, 0x3393) },

	{ USB_DEVICE(0x13d3, 0x3402) },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE02C) },



	/* Atheros AR5BBU22 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE03C) },

	{ USB_DEVICE(0x0489, 0xE036) },

	{ USB_DEVICE(0x0489, 0xE03C) },



	{ }	/* Terminating entry */

};
@@ -118,36 +121,39 @@ MODULE_DEVICE_TABLE(usb, ath3k_table); 
static const struct usb_device_id ath3k_blist_tbl[] = {



	/* Atheros AR3012 with sflash firmware*/

	{ USB_DEVICE(0x0CF3, 0x0036), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0CF3, 0x817a), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0CF3, 0x0036), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311E), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311F), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0CF3, 0x817a), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe003), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU22 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xE036), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },



	{ }	/* Terminating entry */

};

drivers/bluetooth/btusb.c

+32 −26
Original line number Diff line number Diff line
@@ -101,10 +101,10 @@ static const struct usb_device_id btusb_table[] = { 
	{ USB_DEVICE(0x0c10, 0x0000) },



	/* Broadcom BCM20702A0 */

	{ USB_DEVICE(0x0489, 0xe042) },

	{ USB_DEVICE(0x04ca, 0x2003) },

	{ USB_DEVICE(0x0b05, 0x17b5) },

	{ USB_DEVICE(0x0b05, 0x17cb) },

	{ USB_DEVICE(0x04ca, 0x2003) },

	{ USB_DEVICE(0x0489, 0xe042) },

	{ USB_DEVICE(0x413c, 0x8197) },



	/* Foxconn - Hon Hai */
@@ -116,6 +116,9 @@ static const struct usb_device_id btusb_table[] = { 
	/* Belkin F8065bf - Broadcom based */

	{ USB_VENDOR_AND_INTERFACE_INFO(0x050d, 0xff, 0x01, 0x01) },



	/* IMC Networks - Broadcom based */

	{ USB_VENDOR_AND_INTERFACE_INFO(0x13d3, 0xff, 0x01, 0x01) },



	{ }	/* Terminating entry */

};
@@ -129,55 +132,58 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x0a5c, 0x2033), .driver_info = BTUSB_IGNORE },



	/* Atheros 3011 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xe027), .driver_info = BTUSB_IGNORE },

	{ USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },

	{ USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },

	{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },

	{ USB_DEVICE(0x0cf3, 0xe019), .driver_info = BTUSB_IGNORE },

	{ USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },

	{ USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },

	{ USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },

	{ USB_DEVICE(0x0489, 0xe027), .driver_info = BTUSB_IGNORE },



	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },



	/* Atheros 3012 with sflash firmware */

	{ USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x817a), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311e), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311f), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x817a), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe003), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe036), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 },



	/* Broadcom BCM2035 */

	{ USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },

	{ USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },

	{ USB_DEVICE(0x0a5c, 0x2009), .driver_info = BTUSB_BCM92035 },

	{ USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },

	{ USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },



	/* Broadcom BCM2045 */

	{ USB_DEVICE(0x0a5c, 0x2039), .driver_info = BTUSB_WRONG_SCO_MTU },

drivers/bluetooth/hci_vhci.c

+2 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static const struct file_operations vhci_fops = { 
static struct miscdevice vhci_miscdev= {

	.name	= "vhci",

	.fops	= &vhci_fops,

	.minor	= MISC_DYNAMIC_MINOR,

	.minor	= VHCI_MINOR,

};



static int __init vhci_init(void)
@@ -385,3 +385,4 @@ MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION); 
MODULE_VERSION(VERSION);

MODULE_LICENSE("GPL");

MODULE_ALIAS("devname:vhci");

MODULE_ALIAS_MISCDEV(VHCI_MINOR);

include/linux/miscdevice.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#define TEMP_MINOR		131	/* Temperature Sensor */

#define RTC_MINOR		135

#define EFI_RTC_MINOR		136	/* EFI Time services */

#define VHCI_MINOR		137

#define SUN_OPENPROM_MINOR	139

#define DMAPI_MINOR		140	/* DMAPI */

#define NVRAM_MINOR		144