On Fri, Mar 13, 2020 at 02:49:33PM +0100, Rob Schmersel wrote:
> Hi,
>
> I got a new toy to play with recently which uses a bcm43341 wireless
> chipset. This chipset is the same as the bcm43340 apart from an
> additional nfc mode and can re-use the brcmfmac43340-sdio.bin firmware.
> (I simply added a symbolic link from firmware supplied in the
> bwfm-firmware package)
>
> In order to get the chipset recognized however I needed to make some
> changes as attached
Thanks for the diff! Since Linux uses the same firmware (43340) for
both 43340 and 43341, I commited the diff slightly differently to
follow their scheme. Thus there's no need for a symbolic link.
Patrick
Index: ic/bwfmvar.h
===================================================================
RCS file: /cvs/src/sys/dev/ic/bwfmvar.h,v
retrieving revision 1.18
diff -u -p -u -r1.18 bwfmvar.h
--- ic/bwfmvar.h 6 Mar 2020 08:41:57 -0000 1.18
+++ ic/bwfmvar.h 13 Mar 2020 15:28:04 -0000
@@ -27,6 +27,7 @@
#define BRCM_CC_4330_CHIP_ID 0x4330
#define BRCM_CC_4334_CHIP_ID 0x4334
#define BRCM_CC_43340_CHIP_ID 43340
+#define BRCM_CC_43341_CHIP_ID 43341
#define BRCM_CC_43362_CHIP_ID 43362
#define BRCM_CC_4335_CHIP_ID 0x4335
#define BRCM_CC_4339_CHIP_ID 0x4339
Index: sdmmc/if_bwfm_sdio.c
===================================================================
RCS file: /cvs/src/sys/dev/sdmmc/if_bwfm_sdio.c,v
retrieving revision 1.33
diff -u -p -u -r1.33 if_bwfm_sdio.c
--- sdmmc/if_bwfm_sdio.c 7 Mar 2020 09:56:46 -0000 1.33
+++ sdmmc/if_bwfm_sdio.c 13 Mar 2020 15:28:04 -0000
@@ -372,6 +372,7 @@ bwfm_sdio_preinit(struct bwfm_softc *bwf
chip = "43455";
break;
case BRCM_CC_43340_CHIP_ID:
+ case BRCM_CC_43341_CHIP_ID:
chip = "43340";
break;
case BRCM_CC_4335_CHIP_ID:
