Commit ef17c3d2 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'for-net-next-2024-09-12' of... 

Merge tag 'for-net-next-2024-09-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:

 - btusb: Add MediaTek MT7925-B22M support ID 0x13d3:0x3604
 - btusb: Add Realtek RTL8852C support ID 0x0489:0xe122
 - btrtl: Add the support for RTL8922A
 - btusb: Add 2 USB HW IDs for MT7925 (0xe118/e)
 - btnxpuart: Add support for ISO packets
 - btusb: Add Mediatek MT7925 support ID 0x13d3:0x3608
 - btsdio: Do not bind to non-removable CYW4373
 - hci_uart: Add support for Amlogic HCI UART

* tag 'for-net-next-2024-09-12' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next: (27 commits)
  Bluetooth: btintel_pcie: Allocate memory for driver private data
  Bluetooth: btusb: Fix not handling ZPL/short-transfer
  Bluetooth: btusb: Add 2 USB HW IDs for MT7925 (0xe118/e)
  Bluetooth: btsdio: Do not bind to non-removable CYW4373
  Bluetooth: hci_sync: Ignore errors from HCI_OP_REMOTE_NAME_REQ_CANCEL
  Bluetooth: CMTP: Mark BT_CMTP as DEPRECATED
  Bluetooth: replace deprecated strncpy with strscpy_pad
  Bluetooth: hci_core: Fix sending MGMT_EV_CONNECT_FAILED
  Bluetooth: btrtl: Set msft ext address filter quirk for RTL8852B
  Bluetooth: Use led_set_brightness() in LED trigger activate() callback
  Bluetooth: btrtl: Use kvmemdup to simplify the code
  Bluetooth: btusb: Add Mediatek MT7925 support ID 0x13d3:0x3608
  Bluetooth: btrtl: Add the support for RTL8922A
  Bluetooth: hci_ldisc: Use speed set by btattach as oper_speed
  Bluetooth: hci_conn: Remove redundant memset after kzalloc
  Bluetooth: L2CAP: Remove unused declarations
  dt-bindings: bluetooth: bring the HW description closer to reality for wcn6855
  Bluetooth: btnxpuart: Add support for ISO packets
  Bluetooth: hci_h4: Add support for ISO packets in h4_recv.h
  Bluetooth: btusb: Add Realtek RTL8852C support ID 0x0489:0xe122
  ...
====================

Link: https://patch.msgid.link/20240912214317.3054060-1-luiz.dentz@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 26d74602 7ffaa200

Documentation/devicetree/bindings/net/bluetooth/amlogic,w155s2-bt.yaml

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

# Copyright (C) 2024 Amlogic, Inc. All rights reserved

%YAML 1.2

---

$id: http://devicetree.org/schemas/net/bluetooth/amlogic,w155s2-bt.yaml#

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



title: Amlogic Bluetooth chips



description:

  The W155S2 is an Amlogic Bluetooth and Wi-Fi combo chip. It works on

  the standard H4 protocol via a 4-wire UART interface, with baud rates

  up to 4 Mbps.



maintainers:

  - Yang Li <yang.li@amlogic.com>



properties:

  compatible:

    oneOf:

      - items:

          - enum:

              - amlogic,w265s1-bt

              - amlogic,w265p1-bt

          - const: amlogic,w155s2-bt

      - enum:

          - amlogic,w155s2-bt

          - amlogic,w265s2-bt



  clocks:

    maxItems: 1

    description: clock provided to the controller (32.768KHz)



  enable-gpios:

    maxItems: 1



  vddio-supply:

    description: VDD_IO supply regulator handle



  firmware-name:

    maxItems: 1

    description: specify the path of firmware bin to load



required:

  - compatible

  - clocks

  - enable-gpios

  - vddio-supply

  - firmware-name



additionalProperties: false



examples:

  - |

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

    bluetooth {

        compatible = "amlogic,w155s2-bt";

        clocks = <&extclk>;

        enable-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;

        vddio-supply = <&wcn_3v3>;

        firmware-name = "amlogic/aml_w155s2_bt_uart.bin";

    };

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

+5 −5
Original line number Diff line number Diff line
@@ -172,14 +172,14 @@ allOf: 
              - qcom,wcn6855-bt

    then:

      required:

        - enable-gpios

        - swctrl-gpios

        - vddio-supply

        - vddbtcxmx-supply

        - vddrfacmn-supply

        - vddaon-supply

        - vddwlcx-supply

        - vddwlmx-supply

        - vddbtcmx-supply

        - vddrfa0p8-supply

        - vddrfa1p2-supply

        - vddrfa1p7-supply

        - vddrfa1p8-supply

  - if:

      properties:

        compatible:

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -1153,6 +1153,13 @@ S: Supported 
F:	arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi

F:	drivers/net/ethernet/amd/xgbe/









AMLOGIC BLUETOOTH DRIVER









M:	Yang Li <yang.li@amlogic.com>









L:	linux-bluetooth@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/net/bluetooth/amlogic,w155s2-bt.yaml









F:	drivers/bluetooth/hci_aml.c

















AMLOGIC DDR PMU DRIVER









M:	Jiucheng Xu <jiucheng.xu@amlogic.com>









L:	linux-amlogic@lists.infradead.org
































drivers/bluetooth/Kconfig



+12
−0






























Original line number
Diff line number
Diff line







@@ -274,6 +274,18 @@ config BT_HCIUART_MRVL

















	  Say Y here to compile support for HCI MRVL protocol.



















config BT_HCIUART_AML









	bool "Amlogic protocol support"









	depends on BT_HCIUART









	depends on BT_HCIUART_SERDEV









	select BT_HCIUART_H4









	select FW_LOADER









	help









	  The Amlogic protocol support enables Bluetooth HCI over serial









	  port interface for Amlogic Bluetooth controllers.



















	  Say Y here to compile support for HCI AML protocol.



















config BT_HCIBCM203X









	tristate "HCI BCM203x USB driver"









	depends on USB
































drivers/bluetooth/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -51,4 +51,5 @@ hci_uart-$(CONFIG_BT_HCIUART_BCM)	+= hci_bcm.o







hci_uart-$(CONFIG_BT_HCIUART_QCA)	+= hci_qca.o









hci_uart-$(CONFIG_BT_HCIUART_AG6XX)	+= hci_ag6xx.o









hci_uart-$(CONFIG_BT_HCIUART_MRVL)	+= hci_mrvl.o









hci_uart-$(CONFIG_BT_HCIUART_AML)	+= hci_aml.o









hci_uart-objs				:= $(hci_uart-y)