From: "Pali Rohár" <pali@kernel.org>
To: "Ganapathi Bhat" <ganapathi.bhat@nxp.com>,
"Amitkumar Karwar" <amitkarwar@gmail.com>,
"Xinming Hu" <huxinming820@gmail.com>,
"Kalle Valo" <kvalo@codeaurora.org>,
"Marek Behún" <marek.behun@nic.cz>
Cc: linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-wireless@vger.kernel.org,
Hemantkumar Suthar <shemant@marvell.com>,
Rakesh Parmar <rakeshp@marvell.com>,
Zhaoyang Liu <liuzy@marvell.com>, Cathy Luo <cluo@marvell.com>
Subject: [PATCH 3/4] btmrvl: Fix firmware filename for sd8977 chipset
Date: Wed, 3 Jun 2020 10:22:28 +0200 [thread overview]
Message-ID: <20200603082229.15043-4-pali@kernel.org> (raw)
In-Reply-To: <20200603082229.15043-1-pali@kernel.org>
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>
---
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 0f3a020703ab..7aa2c94720bc 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.20.1
next prev parent reply other threads:[~2020-06-03 8:23 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-03 8:22 [PATCH 0/4] marvell: Fix firmware filenames for sd8977/sd8997 chipsets Pali Rohár
2020-06-03 8:22 ` [PATCH 1/4] mwifiex: Fix firmware filename for sd8977 chipset Pali Rohár
2020-06-03 9:18 ` [EXT] " Ganapathi Bhat
2020-06-03 8:22 ` [PATCH 2/4] mwifiex: Fix firmware filename for sd8997 chipset Pali Rohár
2020-06-03 9:18 ` [EXT] " Ganapathi Bhat
2020-06-03 8:22 ` Pali Rohár [this message]
2020-06-03 9:19 ` [EXT] [PATCH 3/4] btmrvl: Fix firmware filename for sd8977 chipset Ganapathi Bhat
2020-06-03 8:22 ` [PATCH 4/4] btmrvl: Fix firmware filename for sd8997 chipset Pali Rohár
2020-06-03 9:19 ` [EXT] " Ganapathi Bhat
2020-06-03 9:17 ` [EXT] [PATCH 0/4] marvell: Fix firmware filenames for sd8977/sd8997 chipsets Ganapathi Bhat
2020-06-03 17:47 ` Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200603082229.15043-4-pali@kernel.org \
--to=pali@kernel.org \
--cc=amitkarwar@gmail.com \
--cc=cluo@marvell.com \
--cc=ganapathi.bhat@nxp.com \
--cc=huxinming820@gmail.com \
--cc=kvalo@codeaurora.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=liuzy@marvell.com \
--cc=marek.behun@nic.cz \
--cc=rakeshp@marvell.com \
--cc=shemant@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).