Messages in this thread | | | Date | Mon, 24 May 2021 15:59:31 +0800 | From | tjiang@codeauro ... | Subject | Re: [PATCH v1] Bluetooth: btusb: use default nvm if boardID is 0 for wcn6855. |
| |
marcel: could you help mainline this change ?
regards. tjiang
On 2021-04-21 17:16, Zijun Hu wrote: > 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 | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c > index 6f25337..61afea9 100644 > --- a/drivers/bluetooth/btusb.c > +++ b/drivers/bluetooth/btusb.c > @@ -4138,9 +4138,14 @@ 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 (le16_to_cpu(ver->board_id) == 0x0) { //if boardid equal 0, use > default nvm. > + 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));
| |