From patchwork Wed Jun 3 08:22:26 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: 215418 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35944C433E1 for ; Wed, 3 Jun 2020 08:22:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F2B91207DA for ; Wed, 3 Jun 2020 08:22:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591172577; bh=iE6Gdr3BLRFDPHFQ3nGskGnayPtPL53jnGaYczx5h5k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=f19QW0q3nSSXzRbK/fl6BFFEqG5P1aG+90pD4kCx4qEwOLCZ+is/px+FyKY6fCYoj cocsTdsDkhNlXwuGgaJBdAqKG81aMTUBz9SHer3cXCXYgR1AxkWGc+PmFF+lSgrzjd cypp9BngUhyw/TDbNyGpopStUils8RVMdvCP8l+I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726376AbgFCIWx (ORCPT ); Wed, 3 Jun 2020 04:22:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:48428 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725275AbgFCIWw (ORCPT ); Wed, 3 Jun 2020 04:22:52 -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 ADBB320825; Wed, 3 Jun 2020 08:22:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591172571; bh=iE6Gdr3BLRFDPHFQ3nGskGnayPtPL53jnGaYczx5h5k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yhi3fSh2sk0eUvW5EOFLkUNUEGDg4t+vpsLsrzA4cKIyVSC6dAHTi0LPFtPGCHykF ayEBUCttUNn6Kzqv7ICJfK3P24nZt3zFIKaQRWPALd8temA8P8lK3R3m9w4mXboIIO Pu9MMzxG9Rj3Kw4crO+B9gCo6AeLQ23jjrJWiWCw= Received: by pali.im (Postfix) id 0C7E26F0; Wed, 3 Jun 2020 10:22:50 +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 1/4] mwifiex: Fix firmware filename for sd8977 chipset Date: Wed, 3 Jun 2020 10:22:26 +0200 Message-Id: <20200603082229.15043-2-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-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@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: 1a0f547831dce ("mwifiex: add support for sd8977 chipset") Signed-off-by: Pali Rohár --- drivers/net/wireless/marvell/mwifiex/sdio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.h b/drivers/net/wireless/marvell/mwifiex/sdio.h index 71cd8629b28e..0cac2296ed53 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.h +++ b/drivers/net/wireless/marvell/mwifiex/sdio.h @@ -36,7 +36,7 @@ #define SD8897_DEFAULT_FW_NAME "mrvl/sd8897_uapsta.bin" #define SD8887_DEFAULT_FW_NAME "mrvl/sd8887_uapsta.bin" #define SD8801_DEFAULT_FW_NAME "mrvl/sd8801_uapsta.bin" -#define SD8977_DEFAULT_FW_NAME "mrvl/sd8977_uapsta.bin" +#define SD8977_DEFAULT_FW_NAME "mrvl/sdsd8977_combo_v2.bin" #define SD8987_DEFAULT_FW_NAME "mrvl/sd8987_uapsta.bin" #define SD8997_DEFAULT_FW_NAME "mrvl/sd8997_uapsta.bin" From patchwork Wed Jun 3 08:22:29 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: 215417 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D1D6C433DF for ; Wed, 3 Jun 2020 08:23:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D08C3207DA for ; Wed, 3 Jun 2020 08:23:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591172587; bh=HZfPXve3yaKU6HtrT1R/7rlrPSqUP6lSnXUj3KLVipk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gA7FCDDj7upvnL60B8bac9mjupPyXRRSkviiOdMydFUiAlbMK8K6Q/Uy7YktwYXLS e0vjcdO3OUP5yNBcjmwgJ+GufTupAt0RkeTh5PpBptRFcqPQX2+IRtFX53+nFKJGZ0 WnFCqoqh2Zl/J5NSFUoLYs9DKSCfUnRGLOlkRDZM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726567AbgFCIXD (ORCPT ); Wed, 3 Jun 2020 04:23:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:48654 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726521AbgFCIXC (ORCPT ); Wed, 3 Jun 2020 04:23:02 -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 68AD220825; Wed, 3 Jun 2020 08:23:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591172581; bh=HZfPXve3yaKU6HtrT1R/7rlrPSqUP6lSnXUj3KLVipk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vpNpkjD3LuW2VjJA69M7/0Xy7utsk3RBgs9VNIafDIREKVBytjtCTQAdfS6miKWCm n5DlZAl/RPLNjCO8BJobF8UxKkkwHGdf2xjaMoAozFy5de6OCoNORIFsLMdZ2P9Sve +opX3Wrex4i0hzsV/P2OK2rQDIUBA1oU5zbbe/dc= Received: by pali.im (Postfix) id C3B796F0; Wed, 3 Jun 2020 10:22:59 +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 4/4] btmrvl: Fix firmware filename for sd8997 chipset Date: Wed, 3 Jun 2020 10:22:29 +0200 Message-Id: <20200603082229.15043-5-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-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org 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 --- 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 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");