| From 9cc825d65566c6e32c0266eb0c85aad756378ef4 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 3 Jun 2020 10:22:28 +0200 |
| Subject: btmrvl: Fix firmware filename for sd8977 chipset |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Pali Rohár <pali@kernel.org> |
| |
| [ Upstream commit dbec3af5f13b88a96e31f252957ae1a82484a923 ] |
| |
| Firmware for sd8977 chipset is distributed by Marvell package and also as |
| part of the linux-firmware repository in filename sdsd8977_combo_v2.bin. |
| |
| This patch fixes mwifiex driver to load correct firmware file for sd8977. |
| |
| Fixes: 8c57983bf7a79 ("Bluetooth: btmrvl: add support for sd8977 chipset") |
| 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: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/bluetooth/btmrvl_sdio.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c |
| index 0f3a020703ab2..7aa2c94720bc5 100644 |
| --- a/drivers/bluetooth/btmrvl_sdio.c |
| +++ b/drivers/bluetooth/btmrvl_sdio.c |
| @@ -328,7 +328,7 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8897 = { |
| |
| static const struct btmrvl_sdio_device btmrvl_sdio_sd8977 = { |
| .helper = NULL, |
| - .firmware = "mrvl/sd8977_uapsta.bin", |
| + .firmware = "mrvl/sdsd8977_combo_v2.bin", |
| .reg = &btmrvl_reg_8977, |
| .support_pscan_win_report = true, |
| .sd_blksz_fw_dl = 256, |
| @@ -1831,6 +1831,6 @@ MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin"); |
| MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin"); |
| MODULE_FIRMWARE("mrvl/sd8887_uapsta.bin"); |
| MODULE_FIRMWARE("mrvl/sd8897_uapsta.bin"); |
| -MODULE_FIRMWARE("mrvl/sd8977_uapsta.bin"); |
| +MODULE_FIRMWARE("mrvl/sdsd8977_combo_v2.bin"); |
| MODULE_FIRMWARE("mrvl/sd8987_uapsta.bin"); |
| MODULE_FIRMWARE("mrvl/sd8997_uapsta.bin"); |
| -- |
| 2.25.1 |
| |
