mac80211: update brcmfmac to the wireless-drivers-next-for-davem-2015-04-09
[oweals/openwrt.git] / package / kernel / mac80211 / patches / 338-brcmfmac-Add-support-for-BCM4345-SDIO-chipset.patch
1 From: Syed Asifful Dayyan <syedd@broadcom.com>
2 Date: Fri, 6 Mar 2015 18:40:42 +0100
3 Subject: [PATCH] brcmfmac: Add support for BCM4345 SDIO chipset.
4
5 These changes add support for BCM4345 SDIO chipset.
6
7 Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
8 Reviewed-by: Arend Van Spriel <arend@broadcom.com>
9 Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
10 Reviewed-by: Daniel (Deognyoun) Kim <dekim@broadcom.com>
11 Signed-off-by: Syed Asifful Dayyan <syedd@broadcom.com>
12 Signed-off-by: Arend van Spriel <arend@broadcom.com>
13 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
14 ---
15
16 --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
17 +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
18 @@ -1096,6 +1096,7 @@ static const struct sdio_device_id brcmf
19         BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43341),
20         BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43362),
21         BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4335_4339),
22 +       BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4345),
23         BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354),
24         { /* end: all zeroes */ }
25  };
26 --- a/drivers/net/wireless/brcm80211/brcmfmac/chip.c
27 +++ b/drivers/net/wireless/brcm80211/brcmfmac/chip.c
28 @@ -491,6 +491,10 @@ static void brcmf_chip_get_raminfo(struc
29         case BRCM_CC_43362_CHIP_ID:
30                 ci->pub.ramsize = 0x3c000;
31                 break;
32 +       case BRCM_CC_4345_CHIP_ID:
33 +               ci->pub.ramsize = 0xc8000;
34 +               ci->pub.rambase = 0x198000;
35 +               break;
36         case BRCM_CC_4339_CHIP_ID:
37         case BRCM_CC_4354_CHIP_ID:
38         case BRCM_CC_4356_CHIP_ID:
39 --- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
40 +++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
41 @@ -617,6 +617,8 @@ static const struct sdiod_drive_str sdio
42  #define BCM43362_NVRAM_NAME            "brcm/brcmfmac43362-sdio.txt"
43  #define BCM4339_FIRMWARE_NAME          "brcm/brcmfmac4339-sdio.bin"
44  #define BCM4339_NVRAM_NAME             "brcm/brcmfmac4339-sdio.txt"
45 +#define BCM4345_FIRMWARE_NAME          "brcm/brcmfmac4345-sdio.bin"
46 +#define BCM4345_NVRAM_NAME             "brcm/brcmfmac4345-sdio.txt"
47  #define BCM4354_FIRMWARE_NAME          "brcm/brcmfmac4354-sdio.bin"
48  #define BCM4354_NVRAM_NAME             "brcm/brcmfmac4354-sdio.txt"
49  
50 @@ -640,6 +642,8 @@ MODULE_FIRMWARE(BCM43362_FIRMWARE_NAME);
51  MODULE_FIRMWARE(BCM43362_NVRAM_NAME);
52  MODULE_FIRMWARE(BCM4339_FIRMWARE_NAME);
53  MODULE_FIRMWARE(BCM4339_NVRAM_NAME);
54 +MODULE_FIRMWARE(BCM4345_FIRMWARE_NAME);
55 +MODULE_FIRMWARE(BCM4345_NVRAM_NAME);
56  MODULE_FIRMWARE(BCM4354_FIRMWARE_NAME);
57  MODULE_FIRMWARE(BCM4354_NVRAM_NAME);
58  
59 @@ -669,6 +673,7 @@ static const struct brcmf_firmware_names
60         { BRCM_CC_4335_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4335) },
61         { BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, BRCMF_FIRMWARE_NVRAM(BCM43362) },
62         { BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4339) },
63 +       { BRCM_CC_4345_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4345) },
64         { BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4354) }
65  };
66  
67 --- a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
68 +++ b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
69 @@ -37,6 +37,7 @@
70  #define BRCM_CC_43362_CHIP_ID          43362
71  #define BRCM_CC_4335_CHIP_ID           0x4335
72  #define BRCM_CC_4339_CHIP_ID           0x4339
73 +#define BRCM_CC_4345_CHIP_ID           0x4345
74  #define BRCM_CC_4354_CHIP_ID           0x4354
75  #define BRCM_CC_4356_CHIP_ID           0x4356
76  #define BRCM_CC_43566_CHIP_ID          43566
77 --- a/include/linux/mmc/sdio_ids.h
78 +++ b/include/linux/mmc/sdio_ids.h
79 @@ -33,6 +33,7 @@
80  #define SDIO_DEVICE_ID_BROADCOM_43341          0xa94d
81  #define SDIO_DEVICE_ID_BROADCOM_4335_4339      0x4335
82  #define SDIO_DEVICE_ID_BROADCOM_43362          0xa962
83 +#define SDIO_DEVICE_ID_BROADCOM_4345           0x4345
84  #define SDIO_DEVICE_ID_BROADCOM_4354           0x4354
85  
86  #define SDIO_VENDOR_ID_INTEL                   0x0089