Skip to content

Commit cd9b6f4

Browse files
committed
Merge tag 'for-net-next-2024-07-15' 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: - qca: use the power sequencer for QCA6390 - btusb: mediatek: add ISO data transmission functions - hci_bcm4377: Add BCM4388 support - btintel: Add support for BlazarU core - btintel: Add support for Whale Peak2 - btnxpuart: Add support for AW693 A1 chipset - btnxpuart: Add support for IW615 chipset - btusb: Add Realtek RTL8852BE support ID 0x13d3:0x3591 * tag 'for-net-next-2024-07-15' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next: (71 commits) Bluetooth: btmtk: Mark all stub functions as inline Bluetooth: hci_qca: Fix build error Bluetooth: hci_qca: use the power sequencer for wcn7850 and wcn6855 Bluetooth: hci_qca: make pwrseq calls the default if available Bluetooth: hci_qca: unduplicate calls to hci_uart_register_device() Bluetooth: hci_qca: schedule a devm action for disabling the clock dt-bindings: bluetooth: qualcomm: describe the inputs from PMU for wcn7850 Bluetooth: btnxpuart: Fix warnings for suspend and resume functions Bluetooth: btnxpuart: Add system suspend and resume handlers Bluetooth: btnxpuart: Add support for IW615 chipset Bluetooth: btnxpuart: Add support for AW693 A1 chipset Bluetooth: btintel: Add support for Whale Peak2 Bluetooth: btintel: Add support for BlazarU core Bluetooth: btusb: mediatek: add ISO data transmission functions Bluetooth: btmtk: move btusb_recv_acl_mtk to btmtk.c Bluetooth: btmtk: move btusb_mtk_[setup, shutdown] to btmtk.c Bluetooth: btmtk: move btusb_mtk_hci_wmt_sync to btmtk.c Bluetooth: btusb: add callback function in btusb suspend/resume Bluetooth: btmtk: rename btmediatek_data Bluetooth: btusb: mediatek: return error for failed reg access ... ==================== Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 30b3560 + 23e8845 commit cd9b6f4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+3693
-2014
lines changed
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/net/bluetooth/mediatek,mt7622-bluetooth.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MediaTek SoC built-in Bluetooth
8+
9+
description:
10+
This device is a serial attached device to BTIF device and thus it must be a
11+
child node of the serial node with BTIF. The dt-bindings details for BTIF
12+
device can be known via Documentation/devicetree/bindings/serial/8250.yaml.
13+
14+
maintainers:
15+
- Sean Wang <[email protected]>
16+
17+
allOf:
18+
- $ref: bluetooth-controller.yaml#
19+
20+
properties:
21+
compatible:
22+
const: mediatek,mt7622-bluetooth
23+
24+
clocks:
25+
maxItems: 1
26+
27+
clock-names:
28+
const: ref
29+
30+
power-domains:
31+
maxItems: 1
32+
33+
required:
34+
- clocks
35+
- clock-names
36+
- power-domains
37+
38+
unevaluatedProperties: false
39+
40+
examples:
41+
- |
42+
#include <dt-bindings/power/mt7622-power.h>
43+
44+
serial {
45+
bluetooth {
46+
compatible = "mediatek,mt7622-bluetooth";
47+
power-domains = <&scpsys MT7622_POWER_DOMAIN_WB>;
48+
clocks = <&clk25m>;
49+
clock-names = "ref";
50+
};
51+
};

Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ properties:
3131
This property depends on the module vendor's
3232
configuration.
3333

34+
firmware-name:
35+
maxItems: 1
36+
3437
required:
3538
- compatible
3639

@@ -42,5 +45,6 @@ examples:
4245
bluetooth {
4346
compatible = "nxp,88w8987-bt";
4447
fw-init-baudrate = <3000000>;
48+
firmware-name = "uartuart8987_bt_v0.bin";
4549
};
4650
};

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

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ properties:
6262
vdddig-supply:
6363
description: VDD_DIG supply regulator handle
6464

65+
vddbtcmx-supply:
66+
description: VDD_BT_CMX supply regulator handle
67+
6568
vddbtcxmx-supply:
6669
description: VDD_BT_CXMX supply regulator handle
6770

@@ -74,6 +77,9 @@ properties:
7477
vddrfa1p7-supply:
7578
description: VDD_RFA_1P7 supply regulator handle
7679

80+
vddrfa1p8-supply:
81+
description: VDD_RFA_1P8 supply regulator handle
82+
7783
vddrfa1p2-supply:
7884
description: VDD_RFA_1P2 supply regulator handle
7985

@@ -86,6 +92,12 @@ properties:
8692
vddasd-supply:
8793
description: VDD_ASD supply regulator handle
8894

95+
vddwlcx-supply:
96+
description: VDD_WLCX supply regulator handle
97+
98+
vddwlmx-supply:
99+
description: VDD_WLMX supply regulator handle
100+
89101
max-speed:
90102
description: see Documentation/devicetree/bindings/serial/serial.yaml
91103

@@ -176,14 +188,27 @@ allOf:
176188
- qcom,wcn7850-bt
177189
then:
178190
required:
179-
- enable-gpios
180-
- swctrl-gpios
181-
- vddio-supply
191+
- vddrfacmn-supply
192+
- vddaon-supply
193+
- vddwlcx-supply
194+
- vddwlmx-supply
195+
- vddrfa0p8-supply
196+
- vddrfa1p2-supply
197+
- vddrfa1p8-supply
198+
- if:
199+
properties:
200+
compatible:
201+
contains:
202+
enum:
203+
- qcom,qca6390-bt
204+
then:
205+
required:
206+
- vddrfacmn-supply
182207
- vddaon-supply
183-
- vdddig-supply
208+
- vddbtcmx-supply
184209
- vddrfa0p8-supply
185210
- vddrfa1p2-supply
186-
- vddrfa1p9-supply
211+
- vddrfa1p7-supply
187212

188213
examples:
189214
- |

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

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,3 @@
1-
MediaTek SoC built-in Bluetooth Devices
2-
==================================
3-
4-
This device is a serial attached device to BTIF device and thus it must be a
5-
child node of the serial node with BTIF. The dt-bindings details for BTIF
6-
device can be known via Documentation/devicetree/bindings/serial/8250.yaml.
7-
8-
Required properties:
9-
10-
- compatible: Must be
11-
"mediatek,mt7622-bluetooth": for MT7622 SoC
12-
- clocks: Should be the clock specifiers corresponding to the entry in
13-
clock-names property.
14-
- clock-names: Should contain "ref" entries.
15-
- power-domains: Phandle to the power domain that the device is part of
16-
17-
Example:
18-
19-
btif: serial@1100c000 {
20-
compatible = "mediatek,mt7622-btif",
21-
"mediatek,mtk-btif";
22-
reg = <0 0x1100c000 0 0x1000>;
23-
interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_LOW>;
24-
clocks = <&pericfg CLK_PERI_BTIF_PD>;
25-
clock-names = "main";
26-
reg-shift = <2>;
27-
reg-io-width = <4>;
28-
29-
bluetooth {
30-
compatible = "mediatek,mt7622-bluetooth";
31-
power-domains = <&scpsys MT7622_POWER_DOMAIN_WB>;
32-
clocks = <&clk25m>;
33-
clock-names = "ref";
34-
};
35-
};
36-
371
MediaTek UART based Bluetooth Devices
382
==================================
393

MAINTAINERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17908,6 +17908,14 @@ F: include/linux/pm_*
1790817908
F: include/linux/powercap.h
1790917909
F: kernel/configs/nopm.config
1791017910

17911+
POWER SEQUENCING
17912+
M: Bartosz Golaszewski <[email protected]>
17913+
17914+
S: Maintained
17915+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
17916+
F: drivers/power/sequencing/
17917+
F: include/linux/pwrseq/
17918+
1791117919
POWER STATE COORDINATION INTERFACE (PSCI)
1791217920
M: Mark Rutland <[email protected]>
1791317921
M: Lorenzo Pieralisi <[email protected]>

drivers/bluetooth/Kconfig

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ config BT_HCIUART
105105
tristate "HCI UART driver"
106106
depends on SERIAL_DEV_BUS || !SERIAL_DEV_BUS
107107
depends on NVMEM || !NVMEM
108+
depends on POWER_SEQUENCING || !POWER_SEQUENCING
108109
depends on TTY
109110
help
110111
Bluetooth HCI UART driver.
@@ -287,12 +288,12 @@ config BT_HCIBCM203X
287288

288289

289290
config BT_HCIBCM4377
290-
tristate "HCI BCM4377/4378/4387 PCIe driver"
291+
tristate "HCI BCM4377/4378/4387/4388 PCIe driver"
291292
depends on PCI
292293
select FW_LOADER
293294
help
294-
Support for Broadcom BCM4377/4378/4387 Bluetooth chipsets attached via
295-
PCIe. These are usually found in Apple machines.
295+
Support for Broadcom BCM4377/4378/4387/4388 Bluetooth chipsets
296+
attached via PCIe. These are usually found in Apple machines.
296297

297298
Say Y here to compile support for HCI BCM4377 family devices into the
298299
kernel or say M to compile it as module (hci_bcm4377).

0 commit comments

Comments
 (0)