From patchwork Wed Jun 3 08:22:27 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: 11585253 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 5DB8A1391 for ; Wed, 3 Jun 2020 08:23:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2A30820825 for ; 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=uSmHbbvEYpZnPu0zZHvhJ/ANKlr8Qu+RlgX1/y92C3Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VtU6pufxLojiCZVE50ecnHH8ZltBqmOFVFazlOxjisUZnfdkeayY1Kj9rSfPOFh4y rG+rUopKi0MmEBr5Ocy8OUjuOVOYmnG/jC00zLauGjLwJAk+K/JjISMaQvb50S67O6 N+zO6fKDI2UrIup7oI83vrvZoh0yhU3+hD027WMc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726421AbgFCIW4 (ORCPT ); Wed, 3 Jun 2020 04:22:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:48508 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725275AbgFCIWz (ORCPT ); Wed, 3 Jun 2020 04:22:55 -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 A352720810; Wed, 3 Jun 2020 08:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591172574; bh=uSmHbbvEYpZnPu0zZHvhJ/ANKlr8Qu+RlgX1/y92C3Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AunphaSwlq0g+Q8Eomu01vPzj/JObXQhZTQl72XC9PRfE6zbrVTCuc4HoPPk6n6Bp L8BnZK79phKO+jtVkF+Yz1a4DGJcrC9msz6SzyeOddEiqfC5YEQMUOWnjjnqOwDq2o 4vwXzDu5JwMFJdDsIi70zeYzRek591sZC3GI5zhA= Received: by pali.im (Postfix) id DF21A6F0; Wed, 3 Jun 2020 10:22:52 +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 2/4] mwifiex: Fix firmware filename for sd8997 chipset Date: Wed, 3 Jun 2020 10:22:27 +0200 Message-Id: <20200603082229.15043-3-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 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: 6d85ef00d9dfe ("mwifiex: add support for 8997 chipset") Signed-off-by: Pali Rohár Acked-by: Ganapathi Bhat --- 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 0cac2296ed53..8b476b007c5e 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.h +++ b/drivers/net/wireless/marvell/mwifiex/sdio.h @@ -38,7 +38,7 @@ #define SD8801_DEFAULT_FW_NAME "mrvl/sd8801_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" +#define SD8997_DEFAULT_FW_NAME "mrvl/sdsd8997_combo_v4.bin" #define BLOCK_MODE 1 #define BYTE_MODE 0