Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp723203ybt; Wed, 1 Jul 2020 08:32:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQX+lAgXNJvbrl6w8oK7aoUmN5S9MsdMhHMggl8ejt1YEzWPxTDvyGsJ/J9MyP+oH4dSSf X-Received: by 2002:a17:906:4c42:: with SMTP id d2mr22727571ejw.345.1593617537266; Wed, 01 Jul 2020 08:32:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593617537; cv=none; d=google.com; s=arc-20160816; b=w/LE1u6KJlu2tdffUpbF++KIn5DNi+bQbxGPszswOVaRLyFS5fUGMxj1bDJR2tUNL5 UDz53mM254+LmhXy+yZoWu2P/5i2i2smCGPJBQwpJ4Riqw7XOk8Kmsf9PGQbmG7jQk0t eA1WsoXQtTr0DHvs1sZdDQIHUt2yLPoTWLX72qrUHekm3jyWaK2jluUyiwpnATAp6D7D +I4wsZiEuPbxSpE3JdBai4krE+4v51dOxV9RrDaoDlLVzytKsUSn5LLj6MN/zAo5SYqy TZ5Urxi4WVQZuRgmheYI5yJAuDJrBZLC0kRE8Qh+s/kH8d0U/iCErVECIotlvHJclAkM zGlg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=c9A2dfvSGvqFtqyAQ6KYRXQ+zLKUcJX1Y+AsrQ6s/ZI=; b=0oS/Dcu4fD6Qt+P2Li2odPnqRcinrPZI5YKp8Dhrx+mjEJOY/qX562XjzEMqRju5JC zYFA4BorYS/v++OH4cXsCfb6R378iTWxS6IyCHjjfy25s11TEdZX7OCgDTRa3PTzl5ua kG+dYe923WpQidkgLkN4rZ+OC+jN0JoHL8GuaELj6tci6vszLdvqQlwWlyqXq88OeQ/2 Y/fLQ44Qn1RZEIq808KgcLcpRroxgnjBbAWfpWjiIUAas3aoYCyJUr5uaUtH74b13Cq3 KTmqyY4d0+jrim89YxbNdeYxJkwoRHFAKZoHnd24j5RZQ1JlkzDnOCdQNf1L75FqprnR yZWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=OWNMZ3rJ; 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 va7si3975531ejb.55.2020.07.01.08.31.47; Wed, 01 Jul 2020 08:32:17 -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=OWNMZ3rJ; 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 S1732069AbgGAPbi (ORCPT + 99 others); Wed, 1 Jul 2020 11:31:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:58550 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731879AbgGAPbi (ORCPT ); Wed, 1 Jul 2020 11:31:38 -0400 Received: from ziggy.cz (unknown [213.195.114.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CAC5220760; Wed, 1 Jul 2020 15:31:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593617497; bh=EB2CkEeCooqWPM+FKciypi3S6C1CFpF0DGtBgv2mghk=; h=From:To:Cc:Subject:Date:From; b=OWNMZ3rJ5ciZjAne86fG6PgL7snREQ8Oxp1PzRvjC7tXhtr/8lDoariL+hIXqRWlI Yda13FmLkR2Juu8D5+Ev+trCwp0K/BNMiMyOTxHtmcwnYPNk0VhVYuti0hKzOM3X+F k1UznWujuneMKF6uv+rNGLf7bXYmaauzozH/eBu0= From: matthias.bgg@kernel.org To: Jakub Kicinski , Kalle Valo , "David S . Miller" , hdegoede@redhat.com Cc: =?UTF-8?q?Pali=20Roh=C3=A1r?= , Guenter Roeck , Chi-Hsien Lin , Franky Lin , Chung-Hsien Hsu , Jean-Philippe Brucker , Double Lo , Frank Kao , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, Arend van Spriel , "Gustavo A . R . Silva" , netdev@vger.kernel.org, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Hante Meuleman , Wright Feng , Matthias Brugger , Saravanan Shanmugham , brcm80211-dev-list@cypress.com, linux-kernel@vger.kernel.org, Ulf Hansson , Soeren Moch Subject: [PATCH] brcmfmac: expose firmware config files through modinfo Date: Wed, 1 Jul 2020 17:31:23 +0200 Message-Id: <20200701153123.25602-1-matthias.bgg@kernel.org> X-Mailer: git-send-email 2.27.0 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 From: Matthias Brugger Apart from a firmware binary the chip needs a config file used by the FW. Add the config files to modinfo so that they can be read by userspace. Signed-off-by: Matthias Brugger --- .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index 310d8075f5d7..ba18df6d8d94 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -624,6 +624,22 @@ BRCMF_FW_DEF(4359, "brcmfmac4359-sdio"); BRCMF_FW_DEF(4373, "brcmfmac4373-sdio"); BRCMF_FW_DEF(43012, "brcmfmac43012-sdio"); +/* firmware config files */ +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac4330-sdio.Prowise-PT301.txt"); +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac43340-sdio.meegopad-t08.txt"); +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac43340-sdio.pov-tab-p1006w-data.txt"); +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt"); +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt"); +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"); +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac43430-sdio.AP6212.txt"); +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt"); +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac43430-sdio.MUR1DX.txt"); +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt"); +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt"); +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt"); +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt"); +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac4356-pcie.gpd-win-pocket.txt"); + static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = { BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143), BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x0000001F, 43241B0), -- 2.27.0