From: megous@megous.com
To: linux-sunxi@googlegroups.com,
Maxime Ripard <maxime.ripard@bootlin.com>,
Chen-Yu Tsai <wens@csie.org>, Rob Herring <robh+dt@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>
Cc: Ondrej Jirman <megous@megous.com>,
Mark Rutland <mark.rutland@arm.com>,
David Airlie <airlied@linux.ie>,
Chi-Hsien Lin <chi-hsien.lin@cypress.com>,
dri-devel@lists.freedesktop.org,
linux-stm32@st-md-mailman.stormreply.com,
brcm80211-dev-list@cypress.com, Jose Abreu <joabreu@synopsys.com>,
Naveen Gupta <naveen.gupta@cypress.com>,
devicetree@vger.kernel.org,
Arend van Spriel <arend.vanspriel@broadcom.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
Hante Meuleman <hante.meuleman@broadcom.com>,
linux-gpio@vger.kernel.org, Wright Feng <wright.feng@cypress.com>,
Giuseppe Cavallaro <peppe.cavallaro@st.com>,
linux-arm-kernel@lists.infradead.org,
Franky Lin <franky.lin@broadcom.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
brcm80211-dev-list.pdl@broadcom.com, netdev@vger.kernel.org,
linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
Kalle Valo <kvalo@codeaurora.org>,
Daniel Vetter <daniel@ffwll.ch>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH v2 11/13] brcmfmac: Loading the correct firmware for brcm43456
Date: Tue, 9 Apr 2019 02:24:50 +0200 [thread overview]
Message-ID: <20190409002452.14551-12-megous@megous.com> (raw)
In-Reply-To: <20190409002452.14551-1-megous@megous.com>
From: Ondrej Jirman <megous@megous.com>
SDIO based brcm43456 is currently misdetected as brcm43455 and the wrong
firmware name is used. Correct the detection and load the correct firmware
file. Chiprev for brcm43456 is "9".
Signed-off-by: Ondrej Jirman <megous@megous.com>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index a06af0cd4a7f..22b73da42822 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -622,6 +622,7 @@ BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio");
/* Note the names are not postfixed with a1 for backward compatibility */
BRCMF_FW_DEF(43430A1, "brcmfmac43430-sdio");
BRCMF_FW_DEF(43455, "brcmfmac43455-sdio");
+BRCMF_FW_DEF(43456, "brcmfmac43456-sdio");
BRCMF_FW_DEF(4354, "brcmfmac4354-sdio");
BRCMF_FW_DEF(4356, "brcmfmac4356-sdio");
BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");
@@ -642,7 +643,8 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339),
BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0),
BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFE, 43430A1),
- BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFFC0, 43455),
+ BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0x00000200, 43456),
+ BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFDC0, 43455),
BRCMF_FW_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),
BRCMF_FW_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),
BRCMF_FW_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373),
--
2.21.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-04-09 0:27 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-09 0:24 [PATCH v2 00/13] Add support for Orange Pi 3 megous
2019-04-09 0:24 ` [PATCH v2 01/13] dt-bindings: sunxi: Add compatible for OrangePi 3 board megous
2019-04-09 8:10 ` Maxime Ripard
2019-04-09 0:24 ` [PATCH v2 02/13] arm64: dts: allwinner: h6: Add Orange Pi 3 DTS megous
2019-04-09 8:12 ` Maxime Ripard
2019-04-09 9:33 ` Ondřej Jirman
2019-04-09 11:59 ` Maxime Ripard
2019-04-09 8:38 ` [linux-sunxi] " Jagan Teki
2019-04-09 11:31 ` Ondřej Jirman
2019-04-09 11:47 ` Maxime Ripard
2019-04-09 13:27 ` Jagan Teki
2019-04-09 0:24 ` [PATCH v2 03/13] net: stmmac: sun8i: add support for Allwinner H6 EMAC megous
2019-04-09 0:24 ` [PATCH v2 04/13] net: stmmac: sun8i: force select external PHY when no internal one megous
2019-04-09 0:24 ` [PATCH v2 05/13] pinctrl: sunxi: Prepare for alternative bias voltage setting methods megous
2019-04-09 8:43 ` Maxime Ripard
2019-04-09 0:24 ` [PATCH v2 06/13] pinctrl: sunxi: Support I/O bias voltage setting on H6 megous
2019-04-09 0:24 ` [PATCH v2 07/13] arm64: dts: allwinner: orange-pi-3: Enable ethernet megous
2019-04-09 0:24 ` [PATCH v2 08/13] drm: sun4i: Add support for enabling DDC I2C bus to dw_hdmi glue megous
2019-04-09 0:24 ` [PATCH v2 09/13] dt-bindings: display: sun4i-drm: Add DDC power supply megous
2019-04-09 0:24 ` [PATCH v2 10/13] arm64: dts: allwinner: orange-pi-3: Enable HDMI output megous
2019-04-09 0:24 ` megous [this message]
2019-04-09 0:24 ` [PATCH v2 12/13] [DO NOT MERGE] arm64: dts: allwinner: h6: Add MMC1 pins megous
2019-04-09 0:24 ` [PATCH v2 13/13] [DO NOT MERGE] arm64: dts: allwinner: orange-pi-3: Enable WiFi megous
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190409002452.14551-12-megous@megous.com \
--to=megous@megous.com \
--cc=airlied@linux.ie \
--cc=alexandre.torgue@st.com \
--cc=arend.vanspriel@broadcom.com \
--cc=brcm80211-dev-list.pdl@broadcom.com \
--cc=brcm80211-dev-list@cypress.com \
--cc=chi-hsien.lin@cypress.com \
--cc=daniel@ffwll.ch \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=franky.lin@broadcom.com \
--cc=hante.meuleman@broadcom.com \
--cc=joabreu@synopsys.com \
--cc=kvalo@codeaurora.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux-sunxi@googlegroups.com \
--cc=linux-wireless@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@bootlin.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=naveen.gupta@cypress.com \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
--cc=robh+dt@kernel.org \
--cc=wens@csie.org \
--cc=wright.feng@cypress.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).