diff options
author | Franky Lin <frankyl@broadcom.com> | 2013-04-11 07:28:53 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-04-12 14:27:55 -0400 |
commit | 6a1c74834c0b1412c6ba34de347ee7a038f2ecd2 (patch) | |
tree | be3270fe2e8767212af9a6fad26781b385102239 /drivers/net | |
parent | 1e9ab4dd258ecbb0f1c377fd4dbe227cdb93d9bd (diff) |
brcmfmac: add BCM4335 sdio interface support
BCM4335 is an a/b/g/n/ac WiFi chip that supports up to 80MHz channel. This patch
adds support for this chip through SDIO interface.
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Piotr Haber <phaber@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
4 files changed, 19 insertions, 0 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c index 716548989e4f..c273ae6b1dec 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | |||
@@ -44,6 +44,7 @@ | |||
44 | #define SDIO_DEVICE_ID_BROADCOM_4329 0x4329 | 44 | #define SDIO_DEVICE_ID_BROADCOM_4329 0x4329 |
45 | #define SDIO_DEVICE_ID_BROADCOM_4330 0x4330 | 45 | #define SDIO_DEVICE_ID_BROADCOM_4330 0x4330 |
46 | #define SDIO_DEVICE_ID_BROADCOM_4334 0x4334 | 46 | #define SDIO_DEVICE_ID_BROADCOM_4334 0x4334 |
47 | #define SDIO_DEVICE_ID_BROADCOM_4335 0x4335 | ||
47 | 48 | ||
48 | #define SDIO_FUNC1_BLOCKSIZE 64 | 49 | #define SDIO_FUNC1_BLOCKSIZE 64 |
49 | #define SDIO_FUNC2_BLOCKSIZE 512 | 50 | #define SDIO_FUNC2_BLOCKSIZE 512 |
@@ -54,6 +55,7 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = { | |||
54 | {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4329)}, | 55 | {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4329)}, |
55 | {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4330)}, | 56 | {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4330)}, |
56 | {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4334)}, | 57 | {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4334)}, |
58 | {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4335)}, | ||
57 | { /* end: all zeroes */ }, | 59 | { /* end: all zeroes */ }, |
58 | }; | 60 | }; |
59 | MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids); | 61 | MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids); |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c index c06bb083c459..07eb24fb6d56 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | |||
@@ -3558,6 +3558,8 @@ static bool brcmf_sdbrcm_chipmatch(u16 chipid) | |||
3558 | return true; | 3558 | return true; |
3559 | if (chipid == BCM4334_CHIP_ID) | 3559 | if (chipid == BCM4334_CHIP_ID) |
3560 | return true; | 3560 | return true; |
3561 | if (chipid == BCM4335_CHIP_ID) | ||
3562 | return true; | ||
3561 | return false; | 3563 | return false; |
3562 | } | 3564 | } |
3563 | 3565 | ||
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c index 5db985cb0e0a..3975b5aa1d39 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c | |||
@@ -493,6 +493,20 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev, | |||
493 | ci->c_inf[3].cib = 0x07004211; | 493 | ci->c_inf[3].cib = 0x07004211; |
494 | ci->ramsize = 0x80000; | 494 | ci->ramsize = 0x80000; |
495 | break; | 495 | break; |
496 | case BCM4335_CHIP_ID: | ||
497 | ci->c_inf[0].wrapbase = 0x18100000; | ||
498 | ci->c_inf[0].cib = 0x2b084411; | ||
499 | ci->c_inf[1].id = BCMA_CORE_SDIO_DEV; | ||
500 | ci->c_inf[1].base = 0x18005000; | ||
501 | ci->c_inf[1].wrapbase = 0x18105000; | ||
502 | ci->c_inf[1].cib = 0x0f004211; | ||
503 | ci->c_inf[2].id = BCMA_CORE_ARM_CR4; | ||
504 | ci->c_inf[2].base = 0x18002000; | ||
505 | ci->c_inf[2].wrapbase = 0x18102000; | ||
506 | ci->c_inf[2].cib = 0x01084411; | ||
507 | ci->ramsize = 0xc0000; | ||
508 | ci->rambase = 0x180000; | ||
509 | break; | ||
496 | default: | 510 | default: |
497 | brcmf_err("chipid 0x%x is not supported\n", ci->chip); | 511 | brcmf_err("chipid 0x%x is not supported\n", ci->chip); |
498 | return -ENODEV; | 512 | return -ENODEV; |
diff --git a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h index e8682855b73a..12c49560be2e 100644 --- a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h +++ b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h | |||
@@ -39,5 +39,6 @@ | |||
39 | #define BCM4330_CHIP_ID 0x4330 | 39 | #define BCM4330_CHIP_ID 0x4330 |
40 | #define BCM4331_CHIP_ID 0x4331 | 40 | #define BCM4331_CHIP_ID 0x4331 |
41 | #define BCM4334_CHIP_ID 0x4334 | 41 | #define BCM4334_CHIP_ID 0x4334 |
42 | #define BCM4335_CHIP_ID 0x4335 | ||
42 | 43 | ||
43 | #endif /* _BRCM_HW_IDS_H_ */ | 44 | #endif /* _BRCM_HW_IDS_H_ */ |