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

Commit 6277547f 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 2018-08-05

Here's the main bluetooth-next pull request for the 4.19 kernel.

 - Added support for Bluetooth Advertising Extensions
 - Added vendor driver support to hci_h5 HCI driver
 - Added serdev support to hci_h5 driver
 - Added support for Qualcomm wcn3990 controller
 - Added support for RTL8723BS and RTL8723DS controllers
 - btusb: Added new ID for Realtek 8723DE
 - Several other smaller fixes & cleanups

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents add0decc 6c3711ec

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

+27 −2
Original line number Original line Diff line number Diff line
@@ -10,12 +10,25 @@ device the slave device is attached to. 
Required properties:

Required properties:

 - compatible: should contain one of the following:

 - compatible: should contain one of the following:

   * "qcom,qca6174-bt"

   * "qcom,qca6174-bt"

   * "qcom,wcn3990-bt"



Optional properties for compatible string qcom,qca6174-bt:





Optional properties:

 - enable-gpios: gpio specifier used to enable chip

 - enable-gpios: gpio specifier used to enable chip

 - clocks: clock provided to the controller (SUSCLK_32KHZ)

 - clocks: clock provided to the controller (SUSCLK_32KHZ)





Example:

Required properties for compatible string qcom,wcn3990-bt:



 - vddio-supply: VDD_IO supply regulator handle.

 - vddxo-supply: VDD_XO supply regulator handle.

 - vddrf-supply: VDD_RF supply regulator handle.

 - vddch0-supply: VDD_CH0 supply regulator handle.



Optional properties for compatible string qcom,wcn3990-bt:



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



Examples:





serial@7570000 {

serial@7570000 {

	label = "BT-UART";

	label = "BT-UART";
@@ -28,3 +41,15 @@ serial@7570000 { 
		clocks = <&divclk4>;

		clocks = <&divclk4>;

	};

	};

};

};



serial@898000 {

	bluetooth {

		compatible = "qcom,wcn3990-bt";



		vddio-supply = <&vreg_s4a_1p8>;

		vddxo-supply = <&vreg_l7a_1p8>;

		vddrf-supply = <&vreg_l17a_1p3>;

		vddch0-supply = <&vreg_l25a_3p3>;

		max-speed = <3200000>;

	};

};

drivers/bluetooth/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -159,6 +159,7 @@ config BT_HCIUART_LL 
config BT_HCIUART_3WIRE

config BT_HCIUART_3WIRE

	bool "Three-wire UART (H5) protocol support"

	bool "Three-wire UART (H5) protocol support"

	depends on BT_HCIUART

	depends on BT_HCIUART

	depends on BT_HCIUART_SERDEV

	help

	help

	  The HCI Three-wire UART Transport Layer makes it possible to

	  The HCI Three-wire UART Transport Layer makes it possible to

	  user the Bluetooth HCI over a serial port interface. The HCI

	  user the Bluetooth HCI over a serial port interface. The HCI

drivers/bluetooth/bfusb.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -490,7 +490,7 @@ static int bfusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 
	count = skb->len;

	count = skb->len;





	/* Max HCI frame size seems to be 1511 + 1 */

	/* Max HCI frame size seems to be 1511 + 1 */

	nskb = bt_skb_alloc(count + 32, GFP_ATOMIC);

	nskb = bt_skb_alloc(count + 32, GFP_KERNEL);

	if (!nskb) {

	if (!nskb) {

		BT_ERR("Can't allocate memory for new packet");

		BT_ERR("Can't allocate memory for new packet");

		return -ENOMEM;

		return -ENOMEM;

drivers/bluetooth/bluecard_cs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -565,7 +565,7 @@ static int bluecard_hci_set_baud_rate(struct hci_dev *hdev, int baud) 
	/* Ericsson baud rate command */

	/* Ericsson baud rate command */

	unsigned char cmd[] = { HCI_COMMAND_PKT, 0x09, 0xfc, 0x01, 0x03 };

	unsigned char cmd[] = { HCI_COMMAND_PKT, 0x09, 0xfc, 0x01, 0x03 };





	skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC);

	skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_KERNEL);

	if (!skb) {

	if (!skb) {

		BT_ERR("Can't allocate mem for new packet");

		BT_ERR("Can't allocate mem for new packet");

		return -1;

		return -1;

drivers/bluetooth/bpa10x.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -289,7 +289,7 @@ static int bpa10x_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 




	skb->dev = (void *) hdev;

	skb->dev = (void *) hdev;





	urb = usb_alloc_urb(0, GFP_ATOMIC);

	urb = usb_alloc_urb(0, GFP_KERNEL);

	if (!urb)

	if (!urb)

		return -ENOMEM;

		return -ENOMEM;
@@ -298,7 +298,7 @@ static int bpa10x_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 




	switch (hci_skb_pkt_type(skb)) {

	switch (hci_skb_pkt_type(skb)) {

	case HCI_COMMAND_PKT:

	case HCI_COMMAND_PKT:

		dr = kmalloc(sizeof(*dr), GFP_ATOMIC);

		dr = kmalloc(sizeof(*dr), GFP_KERNEL);

		if (!dr) {

		if (!dr) {

			usb_free_urb(urb);

			usb_free_urb(urb);

			return -ENOMEM;

			return -ENOMEM;
@@ -343,7 +343,7 @@ static int bpa10x_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 




	usb_anchor_urb(urb, &data->tx_anchor);

	usb_anchor_urb(urb, &data->tx_anchor);





	err = usb_submit_urb(urb, GFP_ATOMIC);

	err = usb_submit_urb(urb, GFP_KERNEL);

	if (err < 0) {

	if (err < 0) {

		bt_dev_err(hdev, "urb %p submission failed", urb);

		bt_dev_err(hdev, "urb %p submission failed", urb);

		kfree(urb->setup_packet);

		kfree(urb->setup_packet);