bluetooth: btmrvl_sdio: look for sd8688 firmware in proper location (77189df4) · Commits · 戴 / test

The firmware images are shared with libertas_sdio WiFi chip and used to be in libertas/ subtree in linux-firmware. As btmrvl_sdio used to look into the linux-firmware root, it ended up being unsuccessful. Since the firmware files are not specific to the libertas hardware, they're being moved into mrvl/ now. Signed-off-by:

Lubomir Rintel <lkundrak@v3.sk> Acked-by:

Marcel Holtmann <marcel@holtmann.org> Signed-off-by:

Gustavo Padovan <gustavo.padovan@collabora.co.uk>

drivers/bluetooth/btmrvl_sdio.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -83,8 +83,8 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = {
		};

		static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {
		.helper = "sd8688_helper.bin",
		.firmware = "sd8688.bin",
		.helper = "mrvl/sd8688_helper.bin",
		.firmware = "mrvl/sd8688.bin",
		.reg = &btmrvl_reg_8688,
		.sd_blksz_fw_dl = 64,
		};
		@@ -1185,7 +1185,7 @@ MODULE_AUTHOR("Marvell International Ltd.");
		MODULE_DESCRIPTION("Marvell BT-over-SDIO driver ver " VERSION);
		MODULE_VERSION(VERSION);
		MODULE_LICENSE("GPL v2");
		MODULE_FIRMWARE("sd8688_helper.bin");
		MODULE_FIRMWARE("sd8688.bin");
		MODULE_FIRMWARE("mrvl/sd8688_helper.bin");
		MODULE_FIRMWARE("mrvl/sd8688.bin");
		MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");
		MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");

Admin message