mac80211: backport brcmfmac to support multiple devices NVRAM
[openwrt.git] / package / kernel / mac80211 / patches / 358-brcmfmac-add-support-for-BCM4324-rev-B5-chipset.patch
1 From: Arend van Spriel <arend@broadcom.com>
2 Date: Tue, 14 Apr 2015 20:10:28 +0200
3 Subject: [PATCH] brcmfmac: add support for BCM4324 rev B5 chipset
4
5 This patch adds support for the BCM4324 B5 revision. This device
6 is similar to BCM43241 from driver and firmware perspective. It
7 is known to be used in Lenovo Thinkpad Tablet devices.
8
9 Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
10 Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
11 Signed-off-by: Arend van Spriel <arend@broadcom.com>
12 ---
13
14 --- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
15 +++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
16 @@ -601,6 +601,8 @@ static const struct sdiod_drive_str sdio
17  #define BCM43241B0_NVRAM_NAME          "brcm/brcmfmac43241b0-sdio.txt"
18  #define BCM43241B4_FIRMWARE_NAME       "brcm/brcmfmac43241b4-sdio.bin"
19  #define BCM43241B4_NVRAM_NAME          "brcm/brcmfmac43241b4-sdio.txt"
20 +#define BCM43241B5_FIRMWARE_NAME       "brcm/brcmfmac43241b5-sdio.bin"
21 +#define BCM43241B5_NVRAM_NAME          "brcm/brcmfmac43241b5-sdio.txt"
22  #define BCM4329_FIRMWARE_NAME          "brcm/brcmfmac4329-sdio.bin"
23  #define BCM4329_NVRAM_NAME             "brcm/brcmfmac4329-sdio.txt"
24  #define BCM4330_FIRMWARE_NAME          "brcm/brcmfmac4330-sdio.bin"
25 @@ -628,6 +630,8 @@ MODULE_FIRMWARE(BCM43241B0_FIRMWARE_NAME
26  MODULE_FIRMWARE(BCM43241B0_NVRAM_NAME);
27  MODULE_FIRMWARE(BCM43241B4_FIRMWARE_NAME);
28  MODULE_FIRMWARE(BCM43241B4_NVRAM_NAME);
29 +MODULE_FIRMWARE(BCM43241B5_FIRMWARE_NAME);
30 +MODULE_FIRMWARE(BCM43241B5_NVRAM_NAME);
31  MODULE_FIRMWARE(BCM4329_FIRMWARE_NAME);
32  MODULE_FIRMWARE(BCM4329_NVRAM_NAME);
33  MODULE_FIRMWARE(BCM4330_FIRMWARE_NAME);
34 @@ -667,7 +671,8 @@ enum brcmf_firmware_type {
35  static const struct brcmf_firmware_names brcmf_fwname_data[] = {
36         { BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM43143) },
37         { BRCM_CC_43241_CHIP_ID, 0x0000001F, BRCMF_FIRMWARE_NVRAM(BCM43241B0) },
38 -       { BRCM_CC_43241_CHIP_ID, 0xFFFFFFE0, BRCMF_FIRMWARE_NVRAM(BCM43241B4) },
39 +       { BRCM_CC_43241_CHIP_ID, 0x00000020, BRCMF_FIRMWARE_NVRAM(BCM43241B4) },
40 +       { BRCM_CC_43241_CHIP_ID, 0xFFFFFFC0, BRCMF_FIRMWARE_NVRAM(BCM43241B5) },
41         { BRCM_CC_4329_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4329) },
42         { BRCM_CC_4330_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4330) },
43         { BRCM_CC_4334_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4334) },