Commit 53fb430e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'for-net-next-2022-03-18' of... 

Merge tag 'for-net-next-2022-03-18' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

Luiz Augusto von Dentz says:

====================
bluetooth-next pull request for net-next:

 - Add support for Asus TF103C
 - Add support for Realtek RTL8852B
 - Add support for Realtek RTL8723BE
 - Add WBS support to mt7921s

* tag 'for-net-next-2022-03-18' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next: (24 commits)
  Bluetooth: ath3k: remove superfluous header files
  Bluetooth: bcm203x: remove superfluous header files
  Bluetooth: hci_bcm: Add the Asus TF103C to the bcm_broken_irq_dmi_table
  Bluetooth: mt7921s: Add WBS support
  Bluetooth: mt7921s: Add .btmtk_get_codec_config_data
  Bluetooth: mt7921s: Add .get_data_path_id
  Bluetooth: mt7921s: Set HCI_QUIRK_VALID_LE_STATES
  Bluetooth: btmtksdio: Fix kernel oops in btmtksdio_interrupt
  Bluetooth: btmtkuart: fix error handling in mtk_hci_wmt_sync()
  Bluetooth: call hci_le_conn_failed with hdev lock in hci_le_conn_failed
  Bluetooth: Send AdvMonitor Dev Found for all matched devices
  Bluetooth: msft: Clear tracked devices on resume
  Bluetooth: fix incorrect nonblock bitmask in bt_sock_wait_ready()
  Bluetooth: Don't assign twice the same value
  Bluetooth: btrtl: Add support for RTL8852B
  Bluetooth: hci_uart: add missing NULL check in h5_enqueue
  Bluetooth: Fix use after free in hci_send_acl
  Bluetooth: btusb: Use quirk to skip HCI_FLT_CLEAR_ALL on fake CSR controllers
  Bluetooth: hci_sync: Add a new quirk to skip HCI_FLT_CLEAR_ALL
  Bluetooth: btmtkuart: fix the conflict between mtk and msft vendor event
  ...
====================

Link: https://lore.kernel.org/r/20220318224752.1477292-1-luiz.dentz@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 79fdce05 726c0eb7

drivers/bluetooth/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ config BT_MTKSDIO 
config BT_MTKUART

	tristate "MediaTek HCI UART driver"

	depends on SERIAL_DEV_BUS

	select BT_MTK

	help

	  MediaTek Bluetooth HCI UART driver.

	  This driver is required if you want to use MediaTek Bluetooth

drivers/bluetooth/ath3k.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/slab.h>

#include <linux/types.h>

#include <linux/errno.h>

#include <linux/device.h>

#include <linux/firmware.h>

#include <linux/usb.h>

#include <asm/unaligned.h>

drivers/bluetooth/bcm203x.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 


#include <linux/module.h>



#include <linux/atomic.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/slab.h>

drivers/bluetooth/btmtk.c

+1 −0
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ MODULE_AUTHOR("Mark Chen <mark-yw.chen@mediatek.com>"); 
MODULE_DESCRIPTION("Bluetooth support for MediaTek devices ver " VERSION);

MODULE_VERSION(VERSION);

MODULE_LICENSE("GPL");

MODULE_FIRMWARE(FIRMWARE_MT7622);

MODULE_FIRMWARE(FIRMWARE_MT7663);

MODULE_FIRMWARE(FIRMWARE_MT7668);

MODULE_FIRMWARE(FIRMWARE_MT7961);

drivers/bluetooth/btmtk.h

+1 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: ISC */

/* Copyright (C) 2021 MediaTek Inc. */



#define FIRMWARE_MT7622		"mediatek/mt7622pr2h.bin"

#define FIRMWARE_MT7663		"mediatek/mt7663pr2h.bin"

#define FIRMWARE_MT7668		"mediatek/mt7668pr2h.bin"

#define FIRMWARE_MT7961		"mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin"