| Message ID | 20210628145412.26046-1-mike.rudenko@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [v2] brcmfmac: use separate firmware for 43430 revision 2 | expand |
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> Failed to apply to wireless-drivers-next, please rebase. Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c' error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Applying: brcmfmac: use separate firmware for 43430 revision 2 Using index info to reconstruct a base tree... M drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c Patch failed at 0001 brcmfmac: use separate firmware for 43430 revision 2 Patch set to Changes Requested.
Hi, Kalle! On 2021-08-01 at 10:25 GMT, Kalle Valo <kvalo@codeaurora.org> wrote: > > Failed to apply to wireless-drivers-next, please rebase. > > Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c' > error: Failed to merge in the changes. > hint: Use 'git am --show-current-patch' to see the failed patch > Applying: brcmfmac: use separate firmware for 43430 revision 2 > Using index info to reconstruct a base tree... > M drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c > Falling back to patching base and 3-way merge... > Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c > CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c > Patch failed at 0001 brcmfmac: use separate firmware for 43430 revision 2 > > Patch set to Changes Requested. I've posted a rebased v3 [1]. Anything else to do for this patch? [1] https://lore.kernel.org/linux-wireless/20210804231308.576071-1-mike.rudenko@gmail.com/ -- Kind regards, Mikhail
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index 16ed325795a8..97fda7e0be7c 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_DEF(43430A1, "brcmfmac43430-sdio"); +BRCMF_FW_DEF(43430B0, "brcmfmac43430b0-sdio"); BRCMF_FW_DEF(43455, "brcmfmac43455-sdio"); BRCMF_FW_DEF(43456, "brcmfmac43456-sdio"); BRCMF_FW_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), @@ -4617,4 +4619,3 @@ int brcmf_sdio_sleep(struct brcmf_sdio *bus, bool sleep) return ret; } -