* [PATCH v2] Bluetooth: btusb: use default nvm if boardID is 0 for wcn6855.
@ 2021-06-01 9:57 Zijun Hu
2021-06-02 20:10 ` Marcel Holtmann
0 siblings, 1 reply; 2+ messages in thread
From: Zijun Hu @ 2021-06-01 9:57 UTC (permalink / raw)
To: marcel, johan.hedberg, luiz.dentz
Cc: linux-kernel, linux-bluetooth, linux-arm-msm, bgodavar, c-hbandi,
hemantg, mka, rjliao, zijuhu, tjiang
From: Tim Jiang <tjiang@codeaurora.org>
if boardID is 0, will use the default nvm file without surfix.
Signed-off-by: Tim Jiang <tjiang@codeaurora.org>
---
drivers/bluetooth/btusb.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index bd5242f..6306816 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -4162,9 +4162,15 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
int err;
if (((ver->flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
- snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_%04x.bin",
- le32_to_cpu(ver->rom_version),
- le16_to_cpu(ver->board_id));
+ /* if boardid equal 0, use default nvm without surfix */
+ if (le16_to_cpu(ver->board_id) == 0x0) {
+ snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin",
+ le32_to_cpu(ver->rom_version));
+ } else {
+ snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_%04x.bin",
+ le32_to_cpu(ver->rom_version),
+ le16_to_cpu(ver->board_id));
+ }
} else {
snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin",
le32_to_cpu(ver->rom_version));
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] Bluetooth: btusb: use default nvm if boardID is 0 for wcn6855.
2021-06-01 9:57 [PATCH v2] Bluetooth: btusb: use default nvm if boardID is 0 for wcn6855 Zijun Hu
@ 2021-06-02 20:10 ` Marcel Holtmann
0 siblings, 0 replies; 2+ messages in thread
From: Marcel Holtmann @ 2021-06-02 20:10 UTC (permalink / raw)
To: Zijun Hu
Cc: Johan Hedberg, Luiz Augusto von Dentz, open list, linux-bluetooth,
MSM, Balakrishna Godavarthi, c-hbandi, Hemantg, Matthias Kaehlcke,
Rocky Liao, tjiang
Hi Zijun,
> if boardID is 0, will use the default nvm file without surfix.
>
> Signed-off-by: Tim Jiang <tjiang@codeaurora.org>
> ---
> drivers/bluetooth/btusb.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-02 20:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-01 9:57 [PATCH v2] Bluetooth: btusb: use default nvm if boardID is 0 for wcn6855 Zijun Hu
2021-06-02 20:10 ` Marcel Holtmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).