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

Commit f7623d34 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 2019-07-07

Here's the main bluetooth-next pull request for 5.3:

 - Added support for new devices from Qualcomm, Realtek and Broadcom and
   MediaTek
 - Various fixes to 6LoWPAN
 - Fix L2CAP PSM namespace separation for LE & BR/EDR
 - Fix behavior with Microsoft Surface Precision Mouse
 - Added support for LE Ping feature
 - Fix L2CAP Disconnect response handling if received in wrong state

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 437fde6c 9ce67c32

Documentation/devicetree/bindings/net/marvell-bluetooth.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
Marvell Bluetooth Chips

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



This documents the binding structure and common properties for serial

attached Marvell Bluetooth devices. The following chips are included in

this binding:



* Marvell 88W8897 Bluetooth devices



Required properties:

 - compatible: should be:

    "mrvl,88w8897"



Optional properties:

None so far



Example:



&serial0 {

	compatible = "ns16550a";

	...

	bluetooth {

		compatible = "mrvl,88w8897";

	};

};

Documentation/devicetree/bindings/net/mediatek-bluetooth.txt

+17 −0
Original line number Diff line number Diff line
@@ -50,16 +50,33 @@ Required properties: 
		  "mediatek,mt7663u-bluetooth": for MT7663U device

		  "mediatek,mt7668u-bluetooth": for MT7668U device

- vcc-supply:	Main voltage regulator



If the pin controller on the platform can support both pinmux and GPIO

control such as the most of MediaTek platform. Please use below properties.



- pinctrl-names: Should be "default", "runtime"

- pinctrl-0: Should contain UART RXD low when the device is powered up to

	     enter proper bootstrap mode.

- pinctrl-1: Should contain UART mode pin ctrl



Else, the pin controller on the platform only can support pinmux control and

the GPIO control still has to rely on the dedicated GPIO controller such as

a legacy MediaTek SoC, MT7621. Please use the below properties.



- boot-gpios:	GPIO same to the pin as UART RXD and used to keep LOW when

		the device is powered up to enter proper bootstrap mode when

- pinctrl-names: Should be "default"

- pinctrl-0: Should contain UART mode pin ctrl



Optional properties:



- reset-gpios:	GPIO used to reset the device whose initial state keeps low,

		if the GPIO is missing, then board-level design should be

		guaranteed.

- clocks:	Should be the clock specifiers corresponding to the entry in

		clock-names property. If the clock is missing, then board-level

		design should be guaranteed.

- clock-names:	Should contain "osc" entry for the external oscillator.

- current-speed:  Current baud rate of the device whose defaults to 921600



Example:

Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Optional properties for compatible string qcom,qca6174-bt: 


 - enable-gpios: gpio specifier used to enable chip

 - clocks: clock provided to the controller (SUSCLK_32KHZ)

 - firmware-name: specify the name of nvm firmware to load



Required properties for compatible string qcom,wcn399x-bt:
@@ -28,6 +29,7 @@ Required properties for compatible string qcom,wcn399x-bt: 
Optional properties for compatible string qcom,wcn399x-bt:



 - max-speed: see Documentation/devicetree/bindings/serial/slave-device.txt

 - firmware-name: specify the name of nvm firmware to load



Examples:
@@ -40,6 +42,7 @@ serial@7570000 { 


		enable-gpios = <&pm8994_gpios 19 GPIO_ACTIVE_HIGH>;

		clocks = <&divclk4>;

		firmware-name = "nvm_00440302.bin";

	};

};
@@ -52,5 +55,6 @@ serial@898000 { 
		vddrf-supply = <&vreg_l17a_1p3>;

		vddch0-supply = <&vreg_l25a_3p3>;

		max-speed = <3200000>;

		firmware-name = "crnv21.bin";

	};

};

drivers/bluetooth/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -52,6 +52,17 @@ config BT_HCIBTUSB_BCM 


	  Say Y here to compile support for Broadcom protocol.



config BT_HCIBTUSB_MTK

	bool "MediaTek protocol support"

	depends on BT_HCIBTUSB

	default n

	help

	  The MediaTek protocol support enables firmware download

	  support and chip initialization for MediaTek Bluetooth

	  USB controllers.



	  Say Y here to compile support for MediaTek protocol.



config BT_HCIBTUSB_RTL

	bool "Realtek protocol support"

	depends on BT_HCIBTUSB
@@ -237,6 +248,7 @@ config BT_HCIUART_AG6XX 
config BT_HCIUART_MRVL

	bool "Marvell protocol support"

	depends on BT_HCIUART

	depends on BT_HCIUART_SERDEV

	select BT_HCIUART_H4

	help

	  Marvell is serial protocol for communication between Bluetooth

drivers/bluetooth/bpa10x.c

+2 −1
Original line number Diff line number Diff line
@@ -359,7 +359,8 @@ static int bpa10x_set_diag(struct hci_dev *hdev, bool enable) 
	return 0;

}



static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id *id)

static int bpa10x_probe(struct usb_interface *intf,

			const struct usb_device_id *id)

{

	struct bpa10x_data *data;

	struct hci_dev *hdev;