Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2658258pxa; Mon, 17 Aug 2020 15:45:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxveqVtnKeCcRbeB0noftMYHlzSJjNBqy2vwarCKkJmk4qzLK7tYYeAIPt3bWJPn0fMitUO X-Received: by 2002:aa7:cd46:: with SMTP id v6mr16318532edw.21.1597704303233; Mon, 17 Aug 2020 15:45:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597704303; cv=none; d=google.com; s=arc-20160816; b=hyXHUimklN3wgw67+we39HXTcxmT3zgjsdRGIExiJK4nVsMSK73n4n0qhOFWdI1KwS nLsOOUeGMRuEEwip3JME60jL+DPygzFd+SlVWc9AUnMg8KEif04ZSmYFuuE7/ObUALq8 QNpzu6TqWbfTHyQP+/rf49Dful0mnEU4xIpvUYjktbs7GRls1k3sMkx2ww94a9iiNPMX qfpmqnwrdtZescse68fd3HLjXaBaVrKBFrJAeIsxfsYOKOzRa8R6xfxRF2UKkI0Iz36d 5xdCWV1LIgT98faOhkGlEOripi18eS1TvSj/YqyjDxRr3YBJH+dzAev+LISmtgfZpKTG i1SQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IxRTVpt13ai7ugvt56VuwZuWdqQutYd2y2Da4QGH6/Q=; b=CSP1M2puusbqaN9gqcwdTforR6EVs+nbG5p6HXTkL6DEu5sAzhUUghl2OSjfGvuTjX c0yovvfRmVw+/Y+AN1UDV8iNXrfyQpWa5YQsEb8nvM4TjNn4ADJN/ghKW5DM7wJgTMWN K0A72nbSpC/ZQi+4zivVBhbpduM+3f6/n+FX3w04zTueV/s6CyNyAQqGsFvnBIvUD+aN 7uJYo9hTvbQ7El0xuEAYSpJmnt4K93Aopuo81JZsC35hpMzL8iQOhVBZu8zKKoHKLOVP 2MY+zWA3kX1qA81xs7PbQHSYtdqrBQvu8IfRtJ4THO6fITtQuhP9+xGlr3fFj+itqodl DpHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qjywQYN2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g22si11739289edm.555.2020.08.17.15.44.40; Mon, 17 Aug 2020 15:45:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=qjywQYN2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730840AbgHQTBA (ORCPT + 99 others); Mon, 17 Aug 2020 15:01:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:60172 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730833AbgHQPsJ (ORCPT ); Mon, 17 Aug 2020 11:48:09 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 3AAFA22CA1; Mon, 17 Aug 2020 15:48:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597679283; bh=YlRh3B+yB1gO6DwsQEz0MDfmSprSyUwxCReZ80FBhQ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qjywQYN2c+15V2/Pa5aCWLogDYjBxjVuzc9Wk/B7H1TQspdkDoRPsuqFnYLX8AFYS mAl7pXMlb8vWIMArhZQnKVvS0Q6CKk56QyFz1oF4OxU6hpBiv7cn9vpzpooSIt5my8 R5v1gOS+YhfiBoTqnfVL96N/G6Ky83841ofvz6Uw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Pali=20Roh=C3=A1r?= , Ganapathi Bhat , Marcel Holtmann , Sasha Levin Subject: [PATCH 5.7 128/393] mwifiex: Fix firmware filename for sd8997 chipset Date: Mon, 17 Aug 2020 17:12:58 +0200 Message-Id: <20200817143825.816146615@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143819.579311991@linuxfoundation.org> References: <20200817143819.579311991@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pali Rohár [ Upstream commit 2e1fcac52a9ea53e5a13a585d48a29a0fb4a9daf ] 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 Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- 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 0cac2296ed53c..8b476b007c5e2 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 -- 2.25.1