Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp317922ybg; Wed, 3 Jun 2020 01:23:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwduSSsNuIGxym9F6FA+GcFRiMDMWyhTJdaYxqTxkGLp3v7qR5A4SSJ95VVQSpiYlar0D1X X-Received: by 2002:a50:9a86:: with SMTP id p6mr30359501edb.153.1591172635075; Wed, 03 Jun 2020 01:23:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591172635; cv=none; d=google.com; s=arc-20160816; b=w9fxC/rwpTQOTYhSYaQxZV/YueRPOkYFC+OVpEQd28NYhhzNVjrnMQsYToJzd/4HFP T3moawYuTT5y6Y+J7H0oZAWTIyOTv02aXD0c3QP/0bY5Ig2HsfVLT1DP1Q8j7hmMvELv PtyJkxpSxgRrQHHOJ8JZpLc9UYTNpln+vOQhcSDt83CKS23/UdBs2pdvO6Wig2Tbf9mp ZhTLR9SLmayauT8Lcq1NuUVbxghzZzKDsg2IWxldlyyK6+3n/qARmmC/wH1Y5Y6n5n+h jxSX2/0I4HGexi4N/fQRldEuv2WakPoaOgCDX6ZzWOVq+3a6bntxJ1uyZ0cw4Y2DnPPc cHJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=g9VnWbhVXi3CnxP+TBRcj07sLLssNAJtZZGqBTg/vjo=; b=NG53MNwBJwaSWVe1twLwwgziLoWyR/stZRjnHtKJQLf2Ngr7nRNAv+VNuVtQ/XZ01X /O1fic884t7l+smapUVKQwIkEq2HHjD2Y2AWUe5RiJ+6ujzMHputOV8/lNS3EWnXV8Bl 3AitgjhodtrnLtK4DKFS8edakRKheTb/CmhEBBqqkakOFsk/Rr8bxFa7q2Q8hd+HQTim XrJojOYeoAwjdxrIPIbjO+etPgvwWxJrt4S4OjDOpfhEmqaxeS2BroJDh/lpHC3kdpYA GJLfvOmHRVeHcNdrOL3nHngMpu2C6sKDaua6466ebpFvdDhuQ4YqQ2s4Wr0xYz7D+iYE ShXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vpNpkjD3; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ar22si797743ejc.434.2020.06.03.01.23.31; Wed, 03 Jun 2020 01:23:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vpNpkjD3; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726567AbgFCIXD (ORCPT + 99 others); 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=20Roh=C3=A1r?= To: Ganapathi Bhat , Amitkumar Karwar , Xinming Hu , Kalle Valo , =?UTF-8?q?Marek=20Beh=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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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"); -- 2.20.1