Commit 4cc58a08 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'for-net-next-2022-12-12' of... 

Merge tag 'for-net-next-2022-12-12' 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 a new VID/PID 0489/e0f2 for MT7922
 - Add Realtek RTL8852BE support ID 0x0cb8:0xc559
 - Add a new PID/VID 13d3/3549 for RTL8822CU
 - Add support for broadcom BCM43430A0 & BCM43430A1
 - Add CONFIG_BT_HCIBTUSB_POLL_SYNC
 - Add CONFIG_BT_LE_L2CAP_ECRED
 - Add support for CYW4373A0
 - Add support for RTL8723DS
 - Add more device IDs for WCN6855
 - Add Broadcom BCM4377 family PCIe Bluetooth

* tag 'for-net-next-2022-12-12' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next: (51 commits)
  Bluetooth: Wait for HCI_OP_WRITE_AUTH_PAYLOAD_TO to complete
  Bluetooth: ISO: Avoid circular locking dependency
  Bluetooth: RFCOMM: don't call kfree_skb() under spin_lock_irqsave()
  Bluetooth: hci_core: don't call kfree_skb() under spin_lock_irqsave()
  Bluetooth: hci_bcsp: don't call kfree_skb() under spin_lock_irqsave()
  Bluetooth: hci_h5: don't call kfree_skb() under spin_lock_irqsave()
  Bluetooth: hci_ll: don't call kfree_skb() under spin_lock_irqsave()
  Bluetooth: hci_qca: don't call kfree_skb() under spin_lock_irqsave()
  Bluetooth: btusb: don't call kfree_skb() under spin_lock_irqsave()
  Bluetooth: btintel: Fix missing free skb in btintel_setup_combined()
  Bluetooth: hci_conn: Fix crash on hci_create_cis_sync
  Bluetooth: btintel: Fix existing sparce warnings
  Bluetooth: btusb: Fix existing sparce warning
  Bluetooth: btusb: Fix new sparce warnings
  Bluetooth: btusb: Add a new PID/VID 13d3/3549 for RTL8822CU
  Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x0cb8:0xc559
  dt-bindings: net: realtek-bluetooth: Add RTL8723DS
  Bluetooth: btusb: Add a new VID/PID 0489/e0f2 for MT7922
  dt-bindings: bluetooth: broadcom: add BCM43430A0 & BCM43430A1
  Bluetooth: hci_bcm4377: Fix missing pci_disable_device() on error in bcm4377_probe()
  ...
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 95d1815f 7aca0ac4

Documentation/devicetree/bindings/net/bluetooth.txt

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
The following properties are common to the Bluetooth controllers:



- local-bd-address: array of 6 bytes, specifies the BD address that was

  uniquely assigned to the Bluetooth device, formatted with least significant

  byte first (little-endian).

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

0 → 100644
+29 −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/bluetooth-controller.yaml#

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



title: Bluetooth Controller Generic Binding



maintainers:

  - Marcel Holtmann <marcel@holtmann.org>

  - Johan Hedberg <johan.hedberg@gmail.com>

  - Luiz Augusto von Dentz <luiz.dentz@gmail.com>



properties:

  $nodename:

    pattern: "^bluetooth(@.*)?$"



  local-bd-address:

    $ref: /schemas/types.yaml#/definitions/uint8-array

    maxItems: 6

    description:

      Specifies the BD address that was uniquely assigned to the Bluetooth

      device. Formatted with least significant byte first (little-endian), e.g.

      in order to assign the address 00:11:22:33:44:55 this property must have

      the value [55 44 33 22 11 00].



additionalProperties: true



...

Documentation/devicetree/bindings/net/bluetooth/brcm,bcm4377-bluetooth.yaml

0 → 100644
+81 −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/brcm,bcm4377-bluetooth.yaml#

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



title: Broadcom BCM4377 family PCIe Bluetooth Chips



maintainers:

  - Sven Peter <sven@svenpeter.dev>



description:

  This binding describes Broadcom BCM4377 family PCIe-attached bluetooth chips

  usually found in Apple machines. The Wi-Fi part of the chip is described in

  bindings/net/wireless/brcm,bcm4329-fmac.yaml.



allOf:

  - $ref: bluetooth-controller.yaml#



properties:

  compatible:

    enum:

      - pci14e4,5fa0 # BCM4377

      - pci14e4,5f69 # BCM4378

      - pci14e4,5f71 # BCM4387



  reg:

    maxItems: 1



  brcm,board-type:

    $ref: /schemas/types.yaml#/definitions/string

    description: Board type of the Bluetooth chip. This is used to decouple

      the overall system board from the Bluetooth module and used to construct

      firmware and calibration data filenames.

      On Apple platforms, this should be the Apple module-instance codename

      prefixed by "apple,", e.g. "apple,atlantisb".

    pattern: '^apple,.*'



  brcm,taurus-cal-blob:

    $ref: /schemas/types.yaml#/definitions/uint8-array

    description: A per-device calibration blob for the Bluetooth radio. This

      should be filled in by the bootloader from platform configuration

      data, if necessary, and will be uploaded to the device.

      This blob is used if the chip stepping of the Bluetooth module does not

      support beamforming.



  brcm,taurus-bf-cal-blob:

    $ref: /schemas/types.yaml#/definitions/uint8-array

    description: A per-device calibration blob for the Bluetooth radio. This

      should be filled in by the bootloader from platform configuration

      data, if necessary, and will be uploaded to the device.

      This blob is used if the chip stepping of the Bluetooth module supports

      beamforming.



  local-bd-address: true



required:

  - compatible

  - reg

  - local-bd-address

  - brcm,board-type



additionalProperties: false



examples:

  - |

    pcie@a0000000 {

      #address-cells = <3>;

      #size-cells = <2>;

      reg = <0xa0000000 0x1000000>;

      device_type = "pci";

      ranges = <0x43000000 0x6 0xa0000000 0xa0000000 0x0 0x20000000>;



      bluetooth@0,1 {

        compatible = "pci14e4,5f69";

        reg = <0x100 0x0 0x0 0x0 0x0>;

        brcm,board-type = "apple,honshu";

        /* To be filled by the bootloader */

        local-bd-address = [00 00 00 00 00 00];

      };

    };

Documentation/devicetree/bindings/net/qualcomm-bluetooth.yaml→Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml

+3 −3
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/qualcomm-bluetooth.yaml#

$id: http://devicetree.org/schemas/net/bluetooth/qualcomm-bluetooth.yaml#

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



title: Qualcomm Bluetooth Chips
@@ -79,8 +79,7 @@ properties: 
  firmware-name:

    description: specify the name of nvm firmware to load



  local-bd-address:

    description: see Documentation/devicetree/bindings/net/bluetooth.txt

  local-bd-address: true





required:
@@ -89,6 +88,7 @@ required: 
additionalProperties: false



allOf:

  - $ref: bluetooth-controller.yaml#

  - if:

      properties:

        compatible:

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

+3 −0
Original line number Diff line number Diff line
@@ -19,11 +19,14 @@ properties: 
      - brcm,bcm4329-bt

      - brcm,bcm4330-bt

      - brcm,bcm4334-bt

      - brcm,bcm43430a0-bt

      - brcm,bcm43430a1-bt

      - brcm,bcm43438-bt

      - brcm,bcm4345c5

      - brcm,bcm43540-bt

      - brcm,bcm4335a0

      - brcm,bcm4349-bt

      - cypress,cyw4373a0-bt

      - infineon,cyw55572-bt



  shutdown-gpios: