diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c index b4d9b475..c8d659ff 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c @@ -626,6 +626,12 @@ static const struct sdiod_drive_str sdiod_drvstr_tab2_3v3[] = { #define BCM4354_FIRMWARE_NAME "brcm/brcmfmac4354-sdio.bin" #define BCM4354_NVRAM_NAME "brcm/brcmfmac4354-sdio.txt" +/* + * AMPAK + */ +#define AP6330_FIRMWARE_NAME "brcm/brcmfmac-ap6330-sdio.bin" +#define AP6330_NVRAM_NAME "brcm/brcmfmac-ap6330-sdio.txt" + MODULE_FIRMWARE(BCM43143_FIRMWARE_NAME); MODULE_FIRMWARE(BCM43143_NVRAM_NAME); MODULE_FIRMWARE(BCM43241B0_FIRMWARE_NAME); @@ -654,6 +660,8 @@ MODULE_FIRMWARE(BCM43455_FIRMWARE_NAME); MODULE_FIRMWARE(BCM43455_NVRAM_NAME); MODULE_FIRMWARE(BCM4354_FIRMWARE_NAME); MODULE_FIRMWARE(BCM4354_NVRAM_NAME); +MODULE_FIRMWARE(AP6330_FIRMWARE_NAME); +MODULE_FIRMWARE(AP6330_NVRAM_NAME); struct brcmf_firmware_names { u32 chipid; @@ -676,7 +684,8 @@ static const struct brcmf_firmware_names brcmf_fwname_data[] = { { BRCM_CC_43241_CHIP_ID, 0x00000020, BRCMF_FIRMWARE_NVRAM(BCM43241B4) }, { BRCM_CC_43241_CHIP_ID, 0xFFFFFFC0, BRCMF_FIRMWARE_NVRAM(BCM43241B5) }, { BRCM_CC_4329_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4329) }, - { BRCM_CC_4330_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4330) }, + { BRCM_CC_4330_CHIP_ID, 0xFFFFFFEF, BRCMF_FIRMWARE_NVRAM(BCM4330) }, + { BRCM_CC_4330_CHIP_ID, 0x10, BRCMF_FIRMWARE_NVRAM(AP6330) }, { BRCM_CC_4334_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4334) }, { BRCM_CC_43340_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM43340) }, { BRCM_CC_4335_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4335) },