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

Commit 7bcfeead 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 2015-10-08

Here's another set of Bluetooth & 802.15.4 patches for the 4.4 kernel.

802.15.4:
 - Many improvements & fixes to the mrf24j40 driver
 - Fixes and cleanups to nl802154, mac802154 & ieee802154 code

Bluetooth:
 - New chipset support in btmrvl driver
 - Fixes & cleanups to btbcm, btmrvl, bpa10x & btintel drivers
 - Support for vendor specific diagnostic data through common API
 - Cleanups to the 6lowpan code
 - New events & message types for monitor channel

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8fae307c f640ee98

Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
* MRF24J40 IEEE 802.15.4 *



Required properties:

  - compatible:		should be "microchip,mrf24j40", "microchip,mrf24j40ma",

			or "microchip,mrf24j40mc" depends on your transceiver

			board

  - spi-max-frequency:	maximal bus speed, should be set something under or equal

			10000000

  - reg:		the chipselect index

  - interrupts:		the interrupt generated by the device.



Example:



	mrf24j40ma@0 {

		compatible = "microchip,mrf24j40ma";

		spi-max-frequency = <8500000>;

		reg = <0>;

		interrupts = <19 8>;

		interrupt-parent = <&gpio3>;

	};

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -6978,6 +6978,7 @@ M: Alan Ott <alan@signal11.us> 
L:	linux-wpan@vger.kernel.org

S:	Maintained

F:	drivers/net/ieee802154/mrf24j40.c

F:	Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt



MSI LAPTOP SUPPORT

M:	"Lee, Chun-Yi" <jlee@suse.com>

drivers/bluetooth/Kconfig

+4 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ menu "Bluetooth device drivers" 


config BT_INTEL

	tristate

	select REGMAP



config BT_BCM

	tristate
@@ -183,6 +184,7 @@ config BT_HCIBCM203X 
config BT_HCIBPA10X

	tristate "HCI BPA10x USB driver"

	depends on USB

	select BT_HCIUART_H4

	help

	  Bluetooth HCI BPA10x USB driver.

	  This driver provides support for the Digianswer BPA 100/105 Bluetooth
@@ -275,7 +277,7 @@ config BT_MRVL 
	  The core driver to support Marvell Bluetooth devices.



	  This driver is required if you want to support

	  Marvell Bluetooth devices, such as 8688/8787/8797/8887/8897.

	  Marvell Bluetooth devices, such as 8688/8787/8797/8887/8897/8997.



	  Say Y here to compile Marvell Bluetooth driver

	  into the kernel or say M to compile it as module.
@@ -289,7 +291,7 @@ config BT_MRVL_SDIO 
	  The driver for Marvell Bluetooth chipsets with SDIO interface.



	  This driver is required if you want to use Marvell Bluetooth

	  devices with SDIO interface. Currently SD8688/SD8787/SD8797/SD8887/SD8897

	  devices with SDIO interface. Currently SD8688/SD8787/SD8797/SD8887/SD8897/SD8997

	  chipsets are supported.



	  Say Y here to compile support for Marvell BT-over-SDIO driver

drivers/bluetooth/bfusb.c

+0 −11
Original line number Diff line number Diff line
@@ -422,17 +422,12 @@ static int bfusb_open(struct hci_dev *hdev) 


	BT_DBG("hdev %p bfusb %p", hdev, data);



	if (test_and_set_bit(HCI_RUNNING, &hdev->flags))

		return 0;



	write_lock_irqsave(&data->lock, flags);



	err = bfusb_rx_submit(data, NULL);

	if (!err) {

		for (i = 1; i < BFUSB_MAX_BULK_RX; i++)

			bfusb_rx_submit(data, NULL);

	} else {

		clear_bit(HCI_RUNNING, &hdev->flags);

	}



	write_unlock_irqrestore(&data->lock, flags);
@@ -458,9 +453,6 @@ static int bfusb_close(struct hci_dev *hdev) 


	BT_DBG("hdev %p bfusb %p", hdev, data);



	if (!test_and_clear_bit(HCI_RUNNING, &hdev->flags))

		return 0;



	write_lock_irqsave(&data->lock, flags);

	write_unlock_irqrestore(&data->lock, flags);
@@ -479,9 +471,6 @@ static int bfusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 


	BT_DBG("hdev %p skb %p type %d len %d", hdev, skb, bt_cb(skb)->pkt_type, skb->len);



	if (!test_bit(HCI_RUNNING, &hdev->flags))

		return -EBUSY;



	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:

		hdev->stat.cmd_tx++;

drivers/bluetooth/bluecard_cs.c

+1 −7
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static void bluecard_receive(struct bluecard_info *info, 
	for (i = 0; i < len; i++) {



		/* Allocate packet */

		if (info->rx_skb == NULL) {

		if (!info->rx_skb) {

			info->rx_state = RECV_WAIT_PACKET_TYPE;

			info->rx_count = 0;

			info->rx_skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC);
@@ -628,9 +628,6 @@ static int bluecard_hci_open(struct hci_dev *hdev) 
	if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state)))

		bluecard_hci_set_baud_rate(hdev, DEFAULT_BAUD_RATE);



	if (test_and_set_bit(HCI_RUNNING, &(hdev->flags)))

		return 0;



	if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state))) {

		unsigned int iobase = info->p_dev->resource[0]->start;
@@ -646,9 +643,6 @@ static int bluecard_hci_close(struct hci_dev *hdev) 
{

	struct bluecard_info *info = hci_get_drvdata(hdev);



	if (!test_and_clear_bit(HCI_RUNNING, &(hdev->flags)))

		return 0;



	bluecard_hci_flush(hdev);



	if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state))) {