Mikhail Rudenko <mike.rudenko@xxxxxxxxx> 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@xxxxxxxxxxxx> > Signed-off-by: Mikhail Rudenko <mike.rudenko@xxxxxxxxx> 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. -- https://patchwork.kernel.org/project/linux-wireless/patch/20210628145412.26046-1-mike.rudenko@xxxxxxxxx/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
