Commit aefd3fb2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-upstream' of... 

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



Johan Hedberg says:

====================
pull request: bluetooth-next 2016-03-01

Here's our main set of Bluetooth & 802.15.4 patches for the 4.6 kernel.

 - New Bluetooth HCI driver for Intel/AG6xx controllers
 - New Broadcom ACPI IDs
 - LED trigger support for indicating Bluetooth powered state
 - Various fixes in mac802154, 6lowpan and related drivers
 - New USB IDs for AR3012 Bluetooth controllers

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5eb4dce3 34bf1912

MAINTAINERS

+5 −4
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ S: Maintained 
F:	drivers/scsi/53c700*



6LOWPAN GENERIC (BTLE/IEEE 802.15.4)

M:	Alexander Aring <alex.aring@gmail.com>

M:	Alexander Aring <aar@pengutronix.de>

M:	Jukka Rissanen <jukka.rissanen@linux.intel.com>

L:	linux-bluetooth@vger.kernel.org

L:	linux-wpan@vger.kernel.org
@@ -5424,10 +5424,11 @@ S: Supported 
F:	drivers/idle/i7300_idle.c



IEEE 802.15.4 SUBSYSTEM

M:	Alexander Aring <alex.aring@gmail.com>

M:	Alexander Aring <aar@pengutronix.de>

L:	linux-wpan@vger.kernel.org

W:	https://github.com/linux-wpan

T:	git git://github.com/linux-wpan/linux-wpan-next.git

W:	http://wpan.cakelab.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git

S:	Maintained

F:	net/ieee802154/

F:	net/mac802154/

drivers/bluetooth/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -169,6 +169,17 @@ config BT_HCIUART_QCA 


	  Say Y here to compile support for QCA protocol.



config BT_HCIUART_AG6XX

	bool "Intel AG6XX protocol support"

	depends on BT_HCIUART

	select BT_HCIUART_H4

	select BT_INTEL

	help

	  The Intel/AG6XX protocol support enables Bluetooth HCI over serial

	  port interface for Intel ibt 2.1 Bluetooth controllers.



	  Say Y here to compile support for Intel AG6XX protocol.



config BT_HCIBCM203X

	tristate "HCI BCM203x USB driver"

	depends on USB

drivers/bluetooth/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ hci_uart-$(CONFIG_BT_HCIUART_3WIRE) += hci_h5.o 
hci_uart-$(CONFIG_BT_HCIUART_INTEL)	+= hci_intel.o

hci_uart-$(CONFIG_BT_HCIUART_BCM)	+= hci_bcm.o

hci_uart-$(CONFIG_BT_HCIUART_QCA)	+= hci_qca.o

hci_uart-$(CONFIG_BT_HCIUART_AG6XX)	+= hci_ag6xx.o

hci_uart-objs				:= $(hci_uart-y)



ccflags-y += -D__CHECK_ENDIAN__

drivers/bluetooth/ath3k.c

+7 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x0489, 0xe05f) },

	{ USB_DEVICE(0x0489, 0xe076) },

	{ USB_DEVICE(0x0489, 0xe078) },

	{ USB_DEVICE(0x0489, 0xe095) },

	{ USB_DEVICE(0x04c5, 0x1330) },

	{ USB_DEVICE(0x04CA, 0x3004) },

	{ USB_DEVICE(0x04CA, 0x3005) },
@@ -92,6 +93,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x04CA, 0x300d) },

	{ USB_DEVICE(0x04CA, 0x300f) },

	{ USB_DEVICE(0x04CA, 0x3010) },

	{ USB_DEVICE(0x04CA, 0x3014) },

	{ USB_DEVICE(0x0930, 0x0219) },

	{ USB_DEVICE(0x0930, 0x021c) },

	{ USB_DEVICE(0x0930, 0x0220) },
@@ -113,6 +115,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3362) },

	{ USB_DEVICE(0x13d3, 0x3375) },

	{ USB_DEVICE(0x13d3, 0x3393) },

	{ USB_DEVICE(0x13d3, 0x3395) },

	{ USB_DEVICE(0x13d3, 0x3402) },

	{ USB_DEVICE(0x13d3, 0x3408) },

	{ USB_DEVICE(0x13d3, 0x3423) },
@@ -144,6 +147,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 },

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

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

	{ USB_DEVICE(0x0489, 0xe095), .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 },
@@ -154,6 +158,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x04ca, 0x300d), .driver_info = BTUSB_ATH3012 },

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

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

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

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

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

	{ USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
@@ -175,6 +180,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ 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, 0x3395), .driver_info = BTUSB_ATH3012 },

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

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

	{ USB_DEVICE(0x13d3, 0x3423), .driver_info = BTUSB_ATH3012 },
@@ -497,6 +503,7 @@ static int ath3k_probe(struct usb_interface *intf, 
	/* match device ID in ath3k blacklist table */

	if (!id->driver_info) {

		const struct usb_device_id *match;



		match = usb_match_id(intf, ath3k_blist_tbl);

		if (match)

			id = match;

drivers/bluetooth/btbcm.c

+2 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ int btbcm_setup_patchram(struct hci_dev *hdev) 
	err = request_firmware(&fw, fw_name, &hdev->dev);

	if (err < 0) {

		BT_INFO("%s: BCM: Patch %s not found", hdev->name, fw_name);

		return 0;

		goto done;

	}



	btbcm_patchram(hdev, fw);
@@ -501,6 +501,7 @@ int btbcm_setup_patchram(struct hci_dev *hdev) 
	BT_INFO("%s: %s", hdev->name, (char *)(skb->data + 1));

	kfree_skb(skb);



done:

	btbcm_check_bdaddr(hdev);



	set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);

CRA Git | Maintained and supported by SUSTech CRA and CCSE