| From 597337727d23c7e8c1372991814d1190dfae6b21 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org> |
| Date: Wed, 3 Jun 2020 10:22:29 +0200 |
| Subject: [PATCH] btmrvl: Fix firmware filename for sd8997 chipset |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit 00eb0cb36fad53315047af12e83c643d3a2c2e49 upstream. |
| |
| Firmware for sd8997 chipset is distributed by Marvell package and also as |
| part of the linux-firmware repository in filename sdsd8997_combo_v4.bin. |
| |
| This patch fixes mwifiex driver to load correct firmware file for sd8997. |
| |
| Fixes: f0ef67485f591 ("Bluetooth: btmrvl: add sd8997 chipset support") |
| Signed-off-by: Pali Rohรกr <pali@kernel.org> |
| Acked-by: Ganapathi Bhat <ganapathi.bhat@nxp.com> |
| Signed-off-by: Marcel Holtmann <marcel@holtmann.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c |
| index 7aa2c94720bc..4c7978cb1786 100644 |
| --- a/drivers/bluetooth/btmrvl_sdio.c |
| +++ b/drivers/bluetooth/btmrvl_sdio.c |
| @@ -346,7 +346,7 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8987 = { |
| |
| static const struct btmrvl_sdio_device btmrvl_sdio_sd8997 = { |
| .helper = NULL, |
| - .firmware = "mrvl/sd8997_uapsta.bin", |
| + .firmware = "mrvl/sdsd8997_combo_v4.bin", |
| .reg = &btmrvl_reg_8997, |
| .support_pscan_win_report = true, |
| .sd_blksz_fw_dl = 256, |
| @@ -1833,4 +1833,4 @@ MODULE_FIRMWARE("mrvl/sd8887_uapsta.bin"); |
| MODULE_FIRMWARE("mrvl/sd8897_uapsta.bin"); |
| MODULE_FIRMWARE("mrvl/sdsd8977_combo_v2.bin"); |
| MODULE_FIRMWARE("mrvl/sd8987_uapsta.bin"); |
| -MODULE_FIRMWARE("mrvl/sd8997_uapsta.bin"); |
| +MODULE_FIRMWARE("mrvl/sdsd8997_combo_v4.bin"); |
| -- |
| 2.27.0 |
| |
