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

Commit 52c05fc7 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 2017-05-23

Here's the first Bluetooth & 802.15.4 pull request targeting the 4.13
kernel release.

 - Bluetooth 5.0 improvements (Data Length Extensions and alternate PHY)
 - Support for new Intel Bluetooth adapter [[8087:0aaa]
 - Various fixes to ieee802154 code
 - Various fixes to HCI UART code
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a0a32d3a 7dab5467

MAINTAINERS

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



6LOWPAN GENERIC (BTLE/IEEE 802.15.4)

M:	Alexander Aring <aar@pengutronix.de>

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

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

L:	linux-bluetooth@vger.kernel.org

L:	linux-wpan@vger.kernel.org
@@ -6427,7 +6427,7 @@ F: Documentation/cdrom/ide-cd 
F:	drivers/ide/ide-cd*



IEEE 802.15.4 SUBSYSTEM

M:	Alexander Aring <aar@pengutronix.de>

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

M:	Stefan Schmidt <stefan@osg.samsung.com>

L:	linux-wpan@vger.kernel.org

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

drivers/bluetooth/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ config BT_HCIUART_NOKIA 
	depends on BT_HCIUART

	depends on BT_HCIUART_SERDEV

	depends on PM

	select BT_HCIUART_H4

	help

	  Nokia H4+ is serial protocol for communication between Bluetooth

	  device and host. This protocol is required for Bluetooth devices
@@ -131,7 +132,7 @@ config BT_HCIUART_ATH3K 


config BT_HCIUART_LL

	bool "HCILL protocol support"

	depends on BT_HCIUART

	depends on BT_HCIUART_SERDEV

	help

	  HCILL (HCI Low Level) is a serial protocol for communication

	  between Bluetooth device and host. This protocol is required for

drivers/bluetooth/btintel.c

+2 −0
Original line number Diff line number Diff line
@@ -575,3 +575,5 @@ MODULE_VERSION(VERSION); 
MODULE_LICENSE("GPL");

MODULE_FIRMWARE("intel/ibt-11-5.sfi");

MODULE_FIRMWARE("intel/ibt-11-5.ddc");

MODULE_FIRMWARE("intel/ibt-12-16.sfi");

MODULE_FIRMWARE("intel/ibt-12-16.ddc");

drivers/bluetooth/btusb.c

+4 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL },

	{ USB_DEVICE(0x8087, 0x0a2b), .driver_info = BTUSB_INTEL_NEW },

	{ USB_DEVICE(0x8087, 0x0aa7), .driver_info = BTUSB_INTEL },

	{ USB_DEVICE(0x8087, 0x0aaa), .driver_info = BTUSB_INTEL_NEW },



	/* Other Intel Bluetooth devices */

	{ USB_VENDOR_AND_INTERFACE_INFO(0x8087, 0xe0, 0x01, 0x01),
@@ -2036,6 +2037,7 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) 
	switch (ver.hw_variant) {

	case 0x0b:	/* SfP */

	case 0x0c:	/* WsP */

	case 0x11:	/* JfP */

	case 0x12:	/* ThP */

		break;

	default:
@@ -2138,6 +2140,8 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) 
	 * Currently the supported hardware variants are:

	 *   11 (0x0b) for iBT3.0 (LnP/SfP)

	 *   12 (0x0c) for iBT3.5 (WsP)

	 *   17 (0x11) for iBT3.5 (JfP)

	 *   18 (0x12) for iBT3.5 (ThP)

	 */

	snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u.sfi",

		 le16_to_cpu(ver.hw_variant),

drivers/bluetooth/btwilink.c

+0 −1
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 
	pkt_type = hci_skb_pkt_type(skb);

	len = hst->st_write(skb);

	if (len < 0) {

		kfree_skb(skb);

		BT_ERR("ST write failed (%ld)", len);

		/* Try Again, would only fail if UART has gone bad */

		return -EAGAIN;