Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2641126pxa; Mon, 17 Aug 2020 15:13:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybdVPGJM9VXNlsLrdlAgVnpbUinUIGG8pQOig5IqwgkMlLEKfF82+dQxhdgYqjFPy2YO9w X-Received: by 2002:aa7:c688:: with SMTP id n8mr17257198edq.345.1597702419231; Mon, 17 Aug 2020 15:13:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597702419; cv=none; d=google.com; s=arc-20160816; b=Zv11Wx2Cu+SPJiyY8s9LtAfRbUa67/J/26ul9EOOWRJhWv0uJ3GhPnYyt8ooNO/Q14 WqGsQW+GfL5n25ZAwpU+Nf7mjXHYIcwLM59yYSbVFMpqD4zTZWe943SdrjEqIEt40imi DkQTgcBBsLJp5DApMGkOhGvLAGH4JzPLR4n2mTUBPQz4+L3wi3cAjKYMOIYcIRWv2EH5 ZUxwJtfEV1fiFIIW+DkTLyLhYB3340dJBqqSYkHo0xozGnSfaIURJjN6bQM0Pxb/aWy7 VDYUQJkpApOcEDRRHtvyL2ZiV1aqP6uxhbxsyXcLyvBDB5j+MnXA6m1grqo0+U7W1CMx rX1w== 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=PRLyzqoFYNGNJmUpRSybkuq2b55cWr0Du+X+S3hqLx8=; b=ghgDyv9atIzVGP2uqI0sOhXQg2PAGzN3cD8P4gAqOf38SLc59hwcvjCipZYWNkY5Ca YGj8D9P3bYAViYvD3f0mEnjk89lQrANHXW6AsWCha9nZjtLF7u/xvD8S8/bwXZnngwkS 6Hz3rSLuAr7nzaS0IwhdmbfvUv3t+mbEvLsiDg8x6YqCd0OeOMdyARieq2wSZUHX8Goi FIK9J/FxpA7NORBs7BXQsNl3DgZGs2gN3tavVsWNncDl9ejvSAoc8eZUI3agBli4PKaq 0mhHfQzz9/K/8+OaY3M0o4XAC7lYU5uxUDNPe92pKbQ2rk8cqVU5VdMEa2PeLu3F81nq vJ2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=UIrbwGYI; 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 b1si12651553ejb.739.2020.08.17.15.13.16; Mon, 17 Aug 2020 15:13:39 -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=UIrbwGYI; 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 S2389163AbgHQQy7 (ORCPT + 99 others); Mon, 17 Aug 2020 12:54:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:51384 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388256AbgHQQDn (ORCPT ); Mon, 17 Aug 2020 12:03:43 -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 F0FA120729; Mon, 17 Aug 2020 16:03:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597680223; bh=3AOwrpxBfMLHIXcFZv2BiZQU27j5feiAgZ6njoFCWg8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UIrbwGYIjVhuWK73F5A6y+7SR1MWsH39x3Dvv38P2wAgnilaaUV2bXee+dkX+MP7K Lu4aRJU8X3hiy984lkhNmlwJu4upcmk6F5HicRjcpihELZAuznFlqMOvFGyMBlnJhW ZVp0aeIV/dGj0GodAdvXhKiwhRNfR+26TOt03K5U= 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.4 093/270] mwifiex: Fix firmware filename for sd8977 chipset Date: Mon, 17 Aug 2020 17:14:54 +0200 Message-Id: <20200817143800.402634765@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143755.807583758@linuxfoundation.org> References: <20200817143755.807583758@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 47fd3ee25e13cc5add48ba2ed71f7ee964b9c3a4 ] 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 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 f672bdf52cc17..9364e2c267f72 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" -- 2.25.1