Commit 79982e8f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'for-net-next-2024-05-14' of... 

Merge tag 'for-net-next-2024-05-14' 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 MediaTek MT7921S SDIO
 - Various fixes for -Wflex-array-member-not-at-end and -Wfamnae
 - Add USB HW IDs for MT7921/MT7922/MT7925
 - Add support for Intel BlazarI and Filmore Peak2 (BE201)
 - Add initial support for Intel PCIe driver
 - Remove HCI_AMP support

* tag 'for-net-next-2024-05-14' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next: (47 commits)
  Bluetooth: btintel_pcie: Refactor and code cleanup
  Bluetooth: btintel_pcie: Fix warning reported by sparse
  Bluetooth: hci_core: Fix not handling hdev->le_num_of_adv_sets=1
  Bluetooth: btintel: Fix compiler warning for multi_v7_defconfig config
  Bluetooth: btintel_pcie: Fix compiler warnings
  Bluetooth: btintel_pcie: Add *setup* function to download firmware
  Bluetooth: btintel_pcie: Add support for PCIe transport
  Bluetooth: btintel: Export few static functions
  Bluetooth: HCI: Remove HCI_AMP support
  Bluetooth: L2CAP: Fix div-by-zero in l2cap_le_flowctl_init()
  Bluetooth: qca: Fix error code in qca_read_fw_build_info()
  Bluetooth: hci_conn: Use __counted_by() and avoid -Wfamnae warning
  Bluetooth: btintel: Add support for Filmore Peak2 (BE201)
  Bluetooth: btintel: Add support for BlazarI
  LE Create Connection command timeout increased to 20 secs
  dt-bindings: net: bluetooth: Add MediaTek MT7921S SDIO Bluetooth
  Bluetooth: compute LE flow credits based on recvbuf space
  Bluetooth: hci_sync: Use cmd->num_cis instead of magic number
  Bluetooth: hci_conn: Use struct_size() in hci_le_big_create_sync()
  Bluetooth: qca: clean up defines
  ...
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 5c167270 6a486c13

Documentation/devicetree/bindings/net/bluetooth/mediatek,mt7921s-bluetooth.yaml

0 → 100644
+55 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/net/bluetooth/mediatek,mt7921s-bluetooth.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: MediaTek MT7921S Bluetooth



maintainers:

  - Sean Wang <sean.wang@mediatek.com>



description:

  MT7921S is an SDIO-attached dual-radio WiFi+Bluetooth Combo chip; each

  function is its own SDIO function on a shared SDIO interface. The chip

  has two dedicated reset lines, one for each function core.

  This binding only covers the Bluetooth SDIO function, with one device

  node describing only this SDIO function.



allOf:

  - $ref: bluetooth-controller.yaml#



properties:

  compatible:

    enum:

      - mediatek,mt7921s-bluetooth



  reg:

    const: 2



  reset-gpios:

    maxItems: 1

    description:

      An active-low reset line for the Bluetooth core; on typical M.2

      key E modules this is the W_DISABLE2# pin.



required:

  - compatible

  - reg



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>



    mmc {

        #address-cells = <1>;

        #size-cells = <0>;



        bluetooth@2 {

            compatible = "mediatek,mt7921s-bluetooth";

            reg = <2>;

            reset-gpios = <&pio 8 GPIO_ACTIVE_LOW>;

        };

    };

Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml

+19 −14
Original line number Diff line number Diff line
@@ -14,7 +14,12 @@ description: 


properties:

  compatible:

    enum:

    oneOf:

      - items:

          - enum:

              - infineon,cyw43439-bt

          - const: brcm,bcm4329-bt

      - enum:

          - brcm,bcm20702a1

          - brcm,bcm4329-bt

          - brcm,bcm4330-bt

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -13763,6 +13763,7 @@ M: Sean Wang <sean.wang@mediatek.com> 
L:	linux-bluetooth@vger.kernel.org

L:	linux-mediatek@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/net/bluetooth/mediatek,mt7921s-bluetooth.yaml

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

F:	drivers/bluetooth/btmtkuart.c
































drivers/bluetooth/Kconfig



+11
−0






























Original line number
Diff line number
Diff line







@@ -478,5 +478,16 @@ config BT_NXPUART







	  Say Y here to compile support for NXP Bluetooth UART device into









	  the kernel, or say M here to compile as a module (btnxpuart).



















config BT_INTEL_PCIE









	tristate "Intel HCI PCIe driver"









	depends on PCI









	select BT_INTEL









	select FW_LOADER









	help









	  Intel Bluetooth transport driver for PCIe.









	  This driver is required if you want to use Intel Bluetooth device









	  with PCIe interface.



















	  Say Y here to compiler support for Intel Bluetooth PCIe device into









	  the kernel or say M to compile it as module (btintel_pcie)









endmenu
























drivers/bluetooth/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -17,6 +17,7 @@ obj-$(CONFIG_BT_HCIBTUSB)	+= btusb.o







obj-$(CONFIG_BT_HCIBTSDIO)	+= btsdio.o



















obj-$(CONFIG_BT_INTEL)		+= btintel.o









obj-$(CONFIG_BT_INTEL_PCIE)	+= btintel_pcie.o btintel.o









obj-$(CONFIG_BT_ATH3K)		+= ath3k.o









obj-$(CONFIG_BT_MRVL)		+= btmrvl.o









obj-$(CONFIG_BT_MRVL_SDIO)	+= btmrvl_sdio.o