brcmfmac: fix rambase for 4359/9
authorSoeren Moch <smoch@web.de>
Wed, 11 Dec 2019 23:52:47 +0000 (00:52 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Wed, 18 Dec 2019 19:07:40 +0000 (21:07 +0200)
Newer 4359 chip revisions need a different rambase address.
This fixes firmware download on such devices which fails otherwise.

Signed-off-by: Soeren Moch <smoch@web.de>
Acked-by: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c

index 0b5fbe5d8270aafbaa95a5275991e91b8e9d8452..baf72e3984fc9ad15e296544682092a35857fcc2 100644 (file)
@@ -712,7 +712,6 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci)
        case BRCM_CC_43569_CHIP_ID:
        case BRCM_CC_43570_CHIP_ID:
        case BRCM_CC_4358_CHIP_ID:
-       case BRCM_CC_4359_CHIP_ID:
        case BRCM_CC_43602_CHIP_ID:
        case BRCM_CC_4371_CHIP_ID:
                return 0x180000;
@@ -722,6 +721,8 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci)
        case BRCM_CC_4366_CHIP_ID:
        case BRCM_CC_43664_CHIP_ID:
                return 0x200000;
+       case BRCM_CC_4359_CHIP_ID:
+               return (ci->pub.chiprev < 9) ? 0x180000 : 0x160000;
        case CY_CC_4373_CHIP_ID:
                return 0x160000;
        default: