diff mbox series

[v3] brcmfmac: use separate firmware for 43430 revision 2

Message ID 20210804231308.576071-1-mike.rudenko@gmail.com
State New
Headers show
Series [v3] brcmfmac: use separate firmware for 43430 revision 2 | expand

Commit Message

Mikhail Rudenko Aug. 4, 2021, 11:13 p.m. UTC 
A separate firmware is needed for Broadcom 43430 revision 2.  This
chip can be found in e.g. certain revisions of Ampak AP6212 wireless
IC. Original firmware file from IC vendor is named
'fw_bcm43436b0.bin', but brcmfmac and also btbcm drivers report chip
id 43430, so requested firmware file name is
'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.

Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com>
---
Changes in v3:
- rebase against wireless-drivers-next
Changes in v2:
- use 43430B0 firmware for all 43430 revisions above 1
- add Reviewed-by tag
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--
2.32.0

Comments

Kalle Valo Aug. 21, 2021, 4:58 p.m. UTC | #1 
Mikhail Rudenko <mike.rudenko@gmail.com> wrote:

> A separate firmware is needed for Broadcom 43430 revision 2.  This

> chip can be found in e.g. certain revisions of Ampak AP6212 wireless

> IC. Original firmware file from IC vendor is named

> 'fw_bcm43436b0.bin', but brcmfmac and also btbcm drivers report chip

> id 43430, so requested firmware file name is

> 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.

> 

> Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>

> Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com>


Patch applied to wireless-drivers-next.git, thanks.

f8d6523891cf brcmfmac: use separate firmware for 43430 revision 2

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20210804231308.576071-1-mike.rudenko@gmail.com/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
diff mbox series

Patch

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 97ee9e2e2e35..baabd3bc9fb1 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -617,6 +617,7 @@  BRCMF_FW_DEF(4339, "brcmfmac4339-sdio");
 BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio");
 /* Note the names are not postfixed with a1 for backward compatibility */
 BRCMF_FW_CLM_DEF(43430A1, "brcmfmac43430-sdio");
+BRCMF_FW_DEF(43430B0, "brcmfmac43430b0-sdio");
 BRCMF_FW_CLM_DEF(43455, "brcmfmac43455-sdio");
 BRCMF_FW_DEF(43456, "brcmfmac43456-sdio");
 BRCMF_FW_CLM_DEF(4354, "brcmfmac4354-sdio");
@@ -643,7 +644,8 @@  static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
 	BRCMF_FW_ENTRY(BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, 43362),
 	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_43430_CHIP_ID, 0x00000002, 43430A1),
+	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFC, 43430B0),
 	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),
@@ -4616,4 +4618,3 @@  int brcmf_sdio_sleep(struct brcmf_sdio *bus, bool sleep)

 	return ret;
 }
-