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

Commit 748a7099 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-12-18

Here's the first bluetooth-next pull request for the 4.16 kernel.

 - hci_ll: multiple cleanups & fixes
 - Remove Gustavo Padovan from the MAINTAINERS file
 - Support BLE Adversing while connected (if the controller can do it)
 - DT updates for TI chips
 - Various other smaller cleanups & fixes

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 566bd54b 22b371cb

Documentation/devicetree/bindings/net/ti,wilink-st.txt→Documentation/devicetree/bindings/net/ti-bluetooth.txt

+16 −2
Original line number Diff line number Diff line 
TI WiLink 7/8 (wl12xx/wl18xx) Shared Transport BT/FM/GPS devices

Texas Instruments Bluetooth Chips

---------------------------------



This documents the binding structure and common properties for serial

attached TI Bluetooth devices. The following chips are included in this

binding:



* TI CC256x Bluetooth devices

* TI WiLink 7/8 (wl12xx/wl18xx) Shared Transport BT/FM/GPS devices



TI WiLink devices have a UART interface for providing Bluetooth, FM radio,

and GPS over what's called "shared transport". The shared transport is

standard BT HCI protocol with additional channels for the other functions.



These devices also have a separate WiFi interface as described in

TI WiLink devices also have a separate WiFi interface as described in

wireless/ti,wlcore.txt.



This bindings follows the UART slave device binding in
@@ -12,6 +20,7 @@ This bindings follows the UART slave device binding in 


Required properties:

 - compatible: should be one of the following:

    "ti,cc2560"

    "ti,wl1271-st"

    "ti,wl1273-st"

    "ti,wl1281-st"
@@ -32,6 +41,9 @@ Optional properties: 
   See ../clocks/clock-bindings.txt for details.

 - clock-names : Must include the following entry:

   "ext_clock" (External clock provided to the TI combo chip).

 - nvmem-cells: phandle to nvmem data cell that contains a 6 byte BD address

   with the most significant byte first (big-endian).

 - nvmem-cell-names: "bd-address" (required when nvmem-cells is specified)



Example:
@@ -43,5 +55,7 @@ Example: 
		enable-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;

		clocks = <&clk32k_wl18xx>;

		clock-names = "ext_clock";

		nvmem-cells = <&bd_address>;

		nvmem-cell-names = "bd-address";

	};

};

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -2689,7 +2689,6 @@ F: drivers/mtd/devices/block2mtd.c 


BLUETOOTH DRIVERS

M:	Marcel Holtmann <marcel@holtmann.org>

M:	Gustavo Padovan <gustavo@padovan.org>

M:	Johan Hedberg <johan.hedberg@gmail.com>

L:	linux-bluetooth@vger.kernel.org

W:	http://www.bluez.org/
@@ -2700,7 +2699,6 @@ F: drivers/bluetooth/ 


BLUETOOTH SUBSYSTEM

M:	Marcel Holtmann <marcel@holtmann.org>

M:	Gustavo Padovan <gustavo@padovan.org>

M:	Johan Hedberg <johan.hedberg@gmail.com>

L:	linux-bluetooth@vger.kernel.org

W:	http://www.bluez.org/

drivers/bluetooth/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -31,6 +31,16 @@ config BT_HCIBTUSB 
	  Say Y here to compile support for Bluetooth USB devices into the

	  kernel or say M to compile it as module (btusb).



config BT_HCIBTUSB_AUTOSUSPEND

	bool "Enable USB autosuspend for Bluetooth USB devices by default"

	depends on BT_HCIBTUSB

	help

	  Say Y here to enable USB autosuspend for Bluetooth USB devices by

	  default.



	  This can be overridden by passing btusb.enable_autosuspend=[y|n]

	  on the kernel commandline.



config BT_HCIBTUSB_BCM

	bool "Broadcom protocol support"

	depends on BT_HCIBTUSB

drivers/bluetooth/bluecard_cs.c

+2 −6
Original line number Diff line number Diff line
@@ -302,9 +302,7 @@ static void bluecard_write_wakeup(struct bluecard_info *info) 
			}



			/* Wait until the command reaches the baseband */

			prepare_to_wait(&wq, &wait, TASK_INTERRUPTIBLE);

			schedule_timeout(HZ/10);

			finish_wait(&wq, &wait);

			mdelay(100);



			/* Set baud on baseband */

			info->ctrl_reg &= ~0x03;
@@ -316,9 +314,7 @@ static void bluecard_write_wakeup(struct bluecard_info *info) 
			outb(info->ctrl_reg, iobase + REG_CONTROL);



			/* Wait before the next HCI packet can be send */

			prepare_to_wait(&wq, &wait, TASK_INTERRUPTIBLE);

			schedule_timeout(HZ);

			finish_wait(&wq, &wait);

			mdelay(1000);

		}



		if (len == skb->len) {

drivers/bluetooth/btqcomsmd.c

+2 −1
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ static int btqcomsmd_send(struct hci_dev *hdev, struct sk_buff *skb) 
		break;

	}



	if (!ret)

		kfree_skb(skb);



	return ret;