From patchwork Wed Jun 3 08:22:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 11585259 X-Patchwork-Delegate: marcel@holtmann.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CEC611391 for ; Wed, 3 Jun 2020 08:23:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B6BA120810 for ; Wed, 3 Jun 2020 08:23:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591172592; bh=6rg6WOIWtJRVYT18qYbnB9TNZyjdNb6mtZSZLIOV0+4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=S5x5e3qnxLJ6FzI2RBFScln8hmT+Ud5K5+uo8DKI2aK2Org69z7n0BAW7XBMNSiJg jEz5oWzJjmSUpmiBvxOTy9shtaTmkmLsJtEVx/XDU6qLmcpBjnuImg1x5EHtvT3Ek0 E+X73AG6R/oRqYmTdV22GxY/4akvaof/b1CrOd14= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726480AbgFCIXB (ORCPT ); Wed, 3 Jun 2020 04:23:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:48574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725275AbgFCIW6 (ORCPT ); Wed, 3 Jun 2020 04:22:58 -0400 Received: from pali.im (pali.im [31.31.79.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 04CEE207DA; Wed, 3 Jun 2020 08:22:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591172578; bh=6rg6WOIWtJRVYT18qYbnB9TNZyjdNb6mtZSZLIOV0+4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fgcDZ7wjJe3YVnUlQFd0bqrgd9sLgh0pxR+/YHUopUIuCr50prR2s2MASqTqOQ+ob VTlRPNWw54E/NO0bhQkkPISvc7BByyd2KS24DfdM4xkLcOfDCUPPI4cWMQKYptwm81 kMcVbUhJcq56rZso2UgXgM2aLLaNnu+ksMNrS//w= Received: by pali.im (Postfix) id 51F8D6F0; Wed, 3 Jun 2020 10:22:56 +0200 (CEST) From: =?utf-8?q?Pali_Roh=C3=A1r?= To: Ganapathi Bhat , Amitkumar Karwar , Xinming Hu , Kalle Valo , =?utf-8?q?Marek_Beh=C3=BAn?= Cc: linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, Hemantkumar Suthar , Rakesh Parmar , Zhaoyang Liu , Cathy Luo Subject: [PATCH 3/4] btmrvl: Fix firmware filename for sd8977 chipset Date: Wed, 3 Jun 2020 10:22:28 +0200 Message-Id: <20200603082229.15043-4-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200603082229.15043-1-pali@kernel.org> References: <20200603082229.15043-1-pali@kernel.org> MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.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 Acked-by: Ganapathi Bhat --- 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");