Skip to content

Commit d2002cc

Browse files
committed
Merge tag 'for-net-next-2025-07-23' 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: core: - hci_sync: fix double free in 'hci_discovery_filter_clear()' - hci_event: Mask data status from LE ext adv reports - hci_devcd_dump: fix out-of-bounds via dev_coredumpv - ISO: add socket option to report packet seqnum via CMSG - hci_event: Add support for handling LE BIG Sync Lost event - ISO: Support SCM_TIMESTAMPING for ISO TS - hci_core: Add PA_LINK to distinguish BIG sync and PA sync connections - hci_sock: Reset cookie to zero in hci_sock_free_cookie() drivers: - btusb: Add new VID/PID 0489/e14e for MT7925 - btusb: Add a new VID/PID 2c7c/7009 for MT7925 - btusb: Add RTL8852BE device 0x13d3:0x3618 - btusb: Add support for variant of RTL8851BE (USB ID 13d3:3601) - btusb: Add USB ID 3625:010b for TP-LINK Archer TX10UB Nano - btusb: QCA: Support downloading custom-made firmwares - btusb: Add one more ID 0x28de:0x1401 for Qualcomm WCN6855 - nxp: add support for supply and reset - btnxpuart: Add support for 4M baudrate - btnxpuart: Correct the Independent Reset handling after FW dump - btnxpuart: Add uevents for FW dump and FW download complete - btintel: Define a macro for Intel Reset vendor command - btintel_pcie: Support Function level reset - btintel_pcie: Add support for device 0x4d76 - btintel_pcie: Make driver wait for alive interrupt - btintel_pcie: Fix Alive Context State Handling - hci_qca: Enable ISO data packet RX * tag 'for-net-next-2025-07-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next: (42 commits) Bluetooth: Add PA_LINK to distinguish BIG sync and PA sync connections Bluetooth: hci_event: Mask data status from LE ext adv reports Bluetooth: btintel_pcie: Fix Alive Context State Handling Bluetooth: btintel_pcie: Make driver wait for alive interrupt Bluetooth: hci_devcd_dump: fix out-of-bounds via dev_coredumpv Bluetooth: hci_sync: fix double free in 'hci_discovery_filter_clear()' Bluetooth: btusb: Add one more ID 0x28de:0x1401 for Qualcomm WCN6855 Bluetooth: btusb: Sort WCN6855 device IDs by VID and PID Bluetooth: btusb: QCA: Support downloading custom-made firmwares Bluetooth: btnxpuart: Add uevents for FW dump and FW download complete Bluetooth: btnxpuart: Correct the Independent Reset handling after FW dump Bluetooth: ISO: Support SCM_TIMESTAMPING for ISO TS Bluetooth: ISO: add socket option to report packet seqnum via CMSG Bluetooth: btintel: Define a macro for Intel Reset vendor command Bluetooth: Fix typos in comments Bluetooth: RFCOMM: Fix typos in comments Bluetooth: aosp: Fix typo in comment Bluetooth: hci_bcm4377: Fix typo in comment Bluetooth: btrtl: Fix typo in comment Bluetooth: btmtk: Fix typo in log string ... ==================== Link: https://patch.msgid.link/20250723190233.166823-1-luiz.dentz@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 parents a4f5759 + a7bcffc commit d2002cc

File tree

29 files changed

+722
-225
lines changed

29 files changed

+722
-225
lines changed

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ properties:
3434
This property depends on the module vendor's
3535
configuration.
3636

37+
max-speed:
38+
$ref: /schemas/types.yaml#/definitions/uint32
39+
enum:
40+
- 3000000
41+
- 4000000
42+
default: 3000000
43+
3744
firmware-name:
3845
maxItems: 1
3946

@@ -65,6 +72,14 @@ properties:
6572
description:
6673
The GPIO number of the NXP chipset used for BT_WAKE_OUT.
6774

75+
vcc-supply:
76+
description:
77+
phandle of the regulator that provides the supply voltage.
78+
79+
reset-gpios:
80+
description:
81+
Chip powerdown/reset signal (PDn).
82+
6883
required:
6984
- compatible
7085

@@ -78,10 +93,13 @@ examples:
7893
bluetooth {
7994
compatible = "nxp,88w8987-bt";
8095
fw-init-baudrate = <3000000>;
96+
max-speed = <4000000>;
8197
firmware-name = "uartuart8987_bt_v0.bin";
8298
device-wakeup-gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
8399
nxp,wakein-pin = /bits/ 8 <18>;
84100
nxp,wakeout-pin = /bits/ 8 <19>;
101+
vcc-supply = <&nxp_iw612_supply>;
102+
reset-gpios = <&gpioctrl 2 GPIO_ACTIVE_LOW>;
85103
local-bd-address = [66 55 44 33 22 11];
86104
interrupt-parent = <&gpio>;
87105
interrupts = <8 IRQ_TYPE_EDGE_FALLING>;

drivers/bluetooth/btintel.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ int btintel_parse_version_tlv(struct hci_dev *hdev,
555555
/* Consume Command Complete Status field */
556556
skb_pull(skb, 1);
557557

558-
/* Event parameters contatin multiple TLVs. Read each of them
558+
/* Event parameters contain multiple TLVs. Read each of them
559559
* and only keep the required data. Also, it use existing legacy
560560
* version field like hw_platform, hw_variant, and fw_variant
561561
* to keep the existing setup flow
@@ -889,7 +889,7 @@ int btintel_send_intel_reset(struct hci_dev *hdev, u32 boot_param)
889889

890890
params.boot_param = cpu_to_le32(boot_param);
891891

892-
skb = __hci_cmd_sync(hdev, 0xfc01, sizeof(params), &params,
892+
skb = __hci_cmd_sync(hdev, BTINTEL_HCI_OP_RESET, sizeof(params), &params,
893893
HCI_INIT_TIMEOUT);
894894
if (IS_ERR(skb)) {
895895
bt_dev_err(hdev, "Failed to send Intel Reset command");
@@ -1287,7 +1287,7 @@ static void btintel_reset_to_bootloader(struct hci_dev *hdev)
12871287
params.boot_option = 0x00;
12881288
params.boot_param = cpu_to_le32(0x00000000);
12891289

1290-
skb = __hci_cmd_sync(hdev, 0xfc01, sizeof(params),
1290+
skb = __hci_cmd_sync(hdev, BTINTEL_HCI_OP_RESET, sizeof(params),
12911291
&params, HCI_INIT_TIMEOUT);
12921292
if (IS_ERR(skb)) {
12931293
bt_dev_err(hdev, "FW download error recovery failed (%ld)",

drivers/bluetooth/btintel.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ struct intel_tlv {
5252
u8 val[];
5353
} __packed;
5454

55+
#define BTINTEL_HCI_OP_RESET 0xfc01
56+
5557
#define BTINTEL_CNVI_BLAZARI 0x900
5658
#define BTINTEL_CNVI_BLAZARIW 0x901
5759
#define BTINTEL_CNVI_GAP 0x910

0 commit comments

Comments
 (0)