diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-19 09:08:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-19 09:08:06 -0700 |
| commit | d0d82a84c965915ac13d08b726b4cb440d90b122 (patch) | |
| tree | 4138287f6fcb5deaa141eeb4b57576d289133cc3 | |
| parent | a288cd69f7dea3cd232b721f935c379b74a69814 (diff) | |
| parent | a39ac4651e3b9d2ca78b6d3dc2a81a6bd25fa616 (diff) | |
Merge tag 'pwrseq-updates-for-v7.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull power sequencing updates from Bartosz Golaszewski:
"This a very tiny pull for v7.3 from the power sequencing tree. It only
contains a handful of updates to the pwrseq-pcie-m2 driver:
- add support for new devices to pwrseq-pcie-m2
- make device matching more fine-grained for cases where the same
combo chips are wired differently on the M.2 card (and - for
instance - don't require serial device creation because they expose
BT over USB) in pwrseq-pcie-m2"
* tag 'pwrseq-updates-for-v7.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
power: sequencing: pcie-m2: Match WCN6855 and WCN7851 UART BT variants by subdevice ID
power: sequencing: pcie-m2: Add QCA2066 (QCNFA765) BT serdev ID
power: sequencing: pcie-m2: Add PCI ID for NXP 88W9098 and AW693 Bluetooth
| -rw-r--r-- | drivers/power/sequencing/pwrseq-pcie-m2.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/power/sequencing/pwrseq-pcie-m2.c b/drivers/power/sequencing/pwrseq-pcie-m2.c index ddfe6ca82494..de9848a9a9f1 100644 --- a/drivers/power/sequencing/pwrseq-pcie-m2.c +++ b/drivers/power/sequencing/pwrseq-pcie-m2.c @@ -185,9 +185,17 @@ static int pwrseq_pcie_m2_match(struct pwrseq_device *pwrseq, } static const struct pci_device_id pwrseq_m2_pci_ids[] = { - { PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x1103), + { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x2b43), + .driver_data = (kernel_ulong_t)"nxp,88w8987-bt" }, + { PCI_DEVICE(PCI_VENDOR_ID_PHILIPS, 0x3003), + .driver_data = (kernel_ulong_t)"nxp,88w8987-bt" }, + { PCI_DEVICE_SUB(PCI_VENDOR_ID_QCOM, 0x1103, PCI_VENDOR_ID_QCOM, 0x0108), + .driver_data = (kernel_ulong_t)"qcom,qca2066-bt" }, + { PCI_DEVICE_SUB(PCI_VENDOR_ID_QCOM, 0x1103, PCI_VENDOR_ID_FOXCONN, 0xe105), .driver_data = (kernel_ulong_t)"qcom,wcn6855-bt" }, - { PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x1107), + { PCI_DEVICE_SUB(PCI_VENDOR_ID_QCOM, 0x1103, PCI_VENDOR_ID_QCOM, 0x337e), + .driver_data = (kernel_ulong_t)"qcom,wcn6855-bt" }, + { PCI_DEVICE_SUB(PCI_VENDOR_ID_QCOM, 0x1107, PCI_VENDOR_ID_QCOM, 0x337c), .driver_data = (kernel_ulong_t)"qcom,wcn7850-bt" }, { } /* Sentinel */ }; |