brcmfmac: add support for bcm43362 device
PATCH 1/1 brcmfmac: add support for bcm43362 device
This patch adds support for the bcm43362 1x1 11n chipset. This chipset is used in AP6210 wifi module found on Cubieboard [1].
---
Hi John,
Here a straggler for new device support that people playing with Cubieboards have been asking for. Intended for v3.14 kernel.
Regards,
Arend
--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 1 + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 5 +++ .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 33 ++++++++++++++++++++ .../net/wireless/brcm80211/include/brcm_hw_ids.h | 1 + 4 files changed, 40 insertions(+)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +1 -0
@@ -945,6 +945,7 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = { {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4329)}, {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4330)}, {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4334)}, + {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_43362)}, {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4335_4339)}, { /* end: all zeroes */ },
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +5 -0
@@ -509,6 +509,8 @@ enum brcmf_sdio_frmtype {#define BCM4334_NVRAM_NAME "brcm/brcmfmac4334-sdio.txt"#define BCM4335_FIRMWARE_NAME "brcm/brcmfmac4335-sdio.bin"#define BCM4335_NVRAM_NAME "brcm/brcmfmac4335-sdio.txt" +#define BCM43362_FIRMWARE_NAME "brcm/brcmfmac43362-sdio.bin" +#define BCM43362_NVRAM_NAME "brcm/brcmfmac43362-sdio.txt"#define BCM4339_FIRMWARE_NAME "brcm/brcmfmac4339-sdio.bin"#define BCM4339_NVRAM_NAME "brcm/brcmfmac4339-sdio.txt"
@@ -526,6 +528,8 @@ MODULE_FIRMWARE(BCM4334_FIRMWARE_NAME);MODULE_FIRMWARE (BCM4334_NVRAM_NAME );MODULE_FIRMWARE (BCM4335_FIRMWARE_NAME );MODULE_FIRMWARE (BCM4335_NVRAM_NAME ); +MODULE_FIRMWARE (BCM43362_FIRMWARE_NAME ); +MODULE_FIRMWARE (BCM43362_NVRAM_NAME );MODULE_FIRMWARE (BCM4339_FIRMWARE_NAME );MODULE_FIRMWARE (BCM4339_NVRAM_NAME );
@@ -552,6 +556,7 @@ static const struct brcmf_firmware_names brcmf_fwname_data[] = { { BCM4330_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4330) }, { BCM4334_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4334) }, { BCM4335_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4335) }, + { BCM43362_CHIP_ID, 0xFFFFFFFE, BRCMF_FIRMWARE_NVRAM(BCM43362) }, { BCM4339_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4339) } };
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c +33 -0
@@ -84,6 +84,17 @@ static const struct sdiod_drive_str sdiod_drvstr_tab1_1v8[] = { {0, 0x1} }; +/* SDIO Drive Strength to sel value table for PMU Rev 13 (1.8v) */ +static const struct sdiod_drive_str sdiod_drive_strength_tab5_1v8[] = { + {6 ,0x7 }, + {5 ,0x6 }, + {4 ,0x5 }, + {3 ,0x4 }, + {2 ,0x2 }, + {1 ,0x1 }, + {0 ,0x0 } +}; +/* SDIO Drive Strength to sel value table for PMU Rev 17 (1.8v) */ static const struct sdiod_drive_str sdiod_drvstr_tab6_1v8[] = { {3 ,0x3 },
@@ -577,6 +588,23 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev, ci->ramsize =0xc0000 ; ci->rambase =0x180000 ;break ; +case BCM43362_CHIP_ID : + ci->c_inf[0 ].wrapbase =0x18100000 ; + ci->c_inf[0 ].cib =0x27004211 ; + ci->c_inf[1 ].id =BCMA_CORE_SDIO_DEV ; + ci->c_inf[1 ].base =0x18002000 ; + ci->c_inf[1 ].wrapbase =0x18102000 ; + ci->c_inf[1 ].cib =0x0a004211 ; + ci->c_inf[2 ].id =BCMA_CORE_INTERNAL_MEM ; + ci->c_inf[2 ].base =0x18004000 ; + ci->c_inf[2 ].wrapbase =0x18104000 ; + ci->c_inf[2 ].cib =0x08080401 ; + ci->c_inf[3 ].id =BCMA_CORE_ARM_CM3 ; + ci->c_inf[3 ].base =0x18003000 ; + ci->c_inf[3 ].wrapbase =0x18103000 ; + ci->c_inf[3 ].cib =0x03004211 ; + ci->ramsize =0x3C000 ; +break ;default :brcmf_err ("chipid 0x%x is not supported\n" , ci->chip);return -ENODEV ;
@@ -782,6 +810,11 @@ brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev,brcmf_sdio_chip_name (ci->chip, chn,8 ), drivestrength);break ; +case SDIOD_DRVSTR_KEY (BCM43362_CHIP_ID ,13 ): + str_tab = sdiod_drive_strength_tab5_1v8; + str_mask =0x00003800 ; + str_shift =11 ; +break ;default : brcmf_err("No SDIO Drive strength init done for chip %s rev %d pmurev %d\n", brcmf_sdio_chip_name(ci->chip, chn, 8),
drivers/net/wireless/brcm80211/include/brcm_hw_ids.h +1 -0
@@ -41,6 +41,7 @@#define BCM4331_CHIP_ID 0x4331#define BCM4334_CHIP_ID 0x4334#define BCM4335_CHIP_ID 0x4335 +#define BCM43362_CHIP_ID 43362#define BCM4339_CHIP_ID 0x4339#endif /* _BRCM_HW_IDS_H_ */
Signature · 1 line
1.7.10.4
Hi Arend,
Quoted 30 lines · Arend van Spriel
This patch adds support for the bcm43362 1x1 11n chipset. This chipset is used in AP6210 wifi module found on Cubieboard [1].
Reviewed-by Franky Lin <[email protected]>Reviewed-by Pieter-Paul Giesberts <[email protected]>Reviewed-by Hante Meuleman <[email protected]>Signed-off-by Arend van Spriel <[email protected]>---
Hi John,Here a straggler for new device support that people playing with Cubieboards have been asking for. Intended for v3.14 kernel.
Regards,
Arend--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 1 + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 5 +++ .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 33 ++++++++++++++++++++ .../net/wireless/brcm80211/include/brcm_hw_ids.h | 1 + 4 files changed, 40 insertions(+)drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +0
-0
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c enum brcmf_sdio_frmtype { · line 513
Quoted 5 lines
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +2
-0@@ -509,6 +509,8 @@ enum brcmf_sdio_frmtype {#define BCM4334_NVRAM_NAME "brcm/brcmfmac4334-sdio.txt"#define BCM4335_FIRMWARE_NAME "brcm/brcmfmac4335-sdio.bin"#define BCM4335_NVRAM_NAME "brcm/brcmfmac4335-sdio.txt" +#define BCM43362_FIRMWARE_NAME "brcm/brcmfmac43362-sdio.bin" +#define BCM43362_NVRAM_NAME "brcm/brcmfmac43362-sdio.txt"
I haven't been following the discussion so this may be redundant, but is this firmware is presently winging it's way towards Linux-firmware?
Thanks,
Signature · 5 lines
Julian Calaby Email: [email protected] Profile: http://www.google.com/profiles/julian.calaby/ .Plan: http://sites.google.com/site/juliancalaby/
Quoted 28 lines · Julian Calaby
Hi Arend,
Quoted 25 lines · Arend van Spriel
This patch adds support for the bcm43362 1x1 11n chipset. This chipset is used in AP6210 wifi module found on Cubieboard [1].
Reviewed-by Franky Lin <[email protected]>Reviewed-by Pieter-Paul Giesberts <[email protected]>Reviewed-by Hante Meuleman <[email protected]>Signed-off-by Arend van Spriel <[email protected]>---
Hi John,Here a straggler for new device support that people playing with Cubieboards have been asking for. Intended for v3.14 kernel.
Regards,
Arend--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 1 + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 5 +++ .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 33 ++++++++++++++++++++ .../net/wireless/brcm80211/include/brcm_hw_ids.h | 1 + 4 files changed, 40 insertions(+)
Quoted 13 lines
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c enum brcmf_sdio_frmtype { · line 513
Quoted 10 lines
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +2
-0@@ -509,6 +509,8 @@ enum brcmf_sdio_frmtype {#define BCM4334_NVRAM_NAME "brcm/brcmfmac4334-sdio.txt"#define BCM4335_FIRMWARE_NAME "brcm/brcmfmac4335-sdio.bin"#define BCM4335_NVRAM_NAME "brcm/brcmfmac4335-sdio.txt" +#define BCM43362_FIRMWARE_NAME "brcm/brcmfmac43362-sdio.bin" +#define BCM43362_NVRAM_NAME "brcm/brcmfmac43362-sdio.txt"I haven't been following the discussion so this may be redundant, but is this firmware is presently winging it's way towards Linux-firmware?
Hi Julian,
The patch for that still has to go out. I am looking whether we have a newer firmware release as the one found on cubieboard.org [1]. So the firmware did not set sail yet (expect it soon :-) ).
Regards,
Arend
[1] http://dl.cubieboard.org/public/Cubieboard/benn/firmware/ap6210/
2014/1/8 Arend van Spriel <[email protected]>:
Quoted 2 lines
This patch adds support for the bcm43362 1x1 11n chipset. This chipset is used in AP6210 wifi module found on Cubieboard [1].
Will you update http://wireless.kernel.org/en/users/Drivers/brcm80211
please? Now, or when it's pushed, whenever you prefer :)