tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

brcmfmac: Add 4356 sdio support

This adds support for the 4356-sdio wireless chip.

Signed-off-by: Christian Daudt <csd@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

authored by

Christian Daudt and committed by
Kalle Valo 496aec57 2f8514b8

+6 -1
+1
drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
··· 1098 1098 BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43430), 1099 1099 BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4345), 1100 1100 BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354), 1101 + BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356), 1101 1102 { /* end: all zeroes */ } 1102 1103 }; 1103 1104 MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);
+1
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
··· 1333 1333 1334 1334 switch (pub->chip) { 1335 1335 case BRCM_CC_4354_CHIP_ID: 1336 + case BRCM_CC_4356_CHIP_ID: 1336 1337 /* explicitly check SR engine enable bit */ 1337 1338 pmu_cc3_mask = BIT(2); 1338 1339 /* fall-through */
+3 -1
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
··· 609 609 BRCMF_FW_NVRAM_DEF(43430, "brcmfmac43430-sdio.bin", "brcmfmac43430-sdio.txt"); 610 610 BRCMF_FW_NVRAM_DEF(43455, "brcmfmac43455-sdio.bin", "brcmfmac43455-sdio.txt"); 611 611 BRCMF_FW_NVRAM_DEF(4354, "brcmfmac4354-sdio.bin", "brcmfmac4354-sdio.txt"); 612 + BRCMF_FW_NVRAM_DEF(4356, "brcmfmac4356-sdio.bin", "brcmfmac4356-sdio.txt"); 612 613 613 614 static struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = { 614 615 BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143), ··· 625 624 BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339), 626 625 BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFF, 43430), 627 626 BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFFC0, 43455), 628 - BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354) 627 + BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354), 628 + BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356) 629 629 }; 630 630 631 631 static void pkt_align(struct sk_buff *p, int len, int align)
+1
include/linux/mmc/sdio_ids.h
··· 36 36 #define SDIO_DEVICE_ID_BROADCOM_43430 0xa9a6 37 37 #define SDIO_DEVICE_ID_BROADCOM_4345 0x4345 38 38 #define SDIO_DEVICE_ID_BROADCOM_4354 0x4354 39 + #define SDIO_DEVICE_ID_BROADCOM_4356 0x4356 39 40 40 41 #define SDIO_VENDOR_ID_INTEL 0x0089 41 42 #define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402