51 lines
2.3 KiB
Diff
51 lines
2.3 KiB
Diff
From: Arend van Spriel <arend@broadcom.com>
|
|
Date: Wed, 18 Mar 2015 13:25:27 +0100
|
|
Subject: [PATCH] brcmfmac: only support the BCM43455/7 device
|
|
|
|
Recently support was added for the BCM4345 SDIO chipset by
|
|
commit 9c51026509d7 ("brcmfmac: Add support for BCM4345 SDIO chipset")
|
|
however this was verified using a BCM43455 device, which is
|
|
a more recent revision of the chip. This patch assure that
|
|
older revisions are not probed as they would fail.
|
|
|
|
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
|
|
Reviewed-by: Syed Asifful Dayyan <syedd@broadcom.com>
|
|
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
|
|
Signed-off-by: Arend van Spriel <arend@broadcom.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
|
|
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
|
|
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
|
|
@@ -617,8 +617,8 @@ static const struct sdiod_drive_str sdio
|
|
#define BCM4339_NVRAM_NAME "brcm/brcmfmac4339-sdio.txt"
|
|
#define BCM43430_FIRMWARE_NAME "brcm/brcmfmac43430-sdio.bin"
|
|
#define BCM43430_NVRAM_NAME "brcm/brcmfmac43430-sdio.txt"
|
|
-#define BCM4345_FIRMWARE_NAME "brcm/brcmfmac4345-sdio.bin"
|
|
-#define BCM4345_NVRAM_NAME "brcm/brcmfmac4345-sdio.txt"
|
|
+#define BCM43455_FIRMWARE_NAME "brcm/brcmfmac43455-sdio.bin"
|
|
+#define BCM43455_NVRAM_NAME "brcm/brcmfmac43455-sdio.txt"
|
|
#define BCM4354_FIRMWARE_NAME "brcm/brcmfmac4354-sdio.bin"
|
|
#define BCM4354_NVRAM_NAME "brcm/brcmfmac4354-sdio.txt"
|
|
|
|
@@ -644,8 +644,8 @@ MODULE_FIRMWARE(BCM4339_FIRMWARE_NAME);
|
|
MODULE_FIRMWARE(BCM4339_NVRAM_NAME);
|
|
MODULE_FIRMWARE(BCM43430_FIRMWARE_NAME);
|
|
MODULE_FIRMWARE(BCM43430_NVRAM_NAME);
|
|
-MODULE_FIRMWARE(BCM4345_FIRMWARE_NAME);
|
|
-MODULE_FIRMWARE(BCM4345_NVRAM_NAME);
|
|
+MODULE_FIRMWARE(BCM43455_FIRMWARE_NAME);
|
|
+MODULE_FIRMWARE(BCM43455_NVRAM_NAME);
|
|
MODULE_FIRMWARE(BCM4354_FIRMWARE_NAME);
|
|
MODULE_FIRMWARE(BCM4354_NVRAM_NAME);
|
|
|
|
@@ -676,7 +676,7 @@ static const struct brcmf_firmware_names
|
|
{ BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, BRCMF_FIRMWARE_NVRAM(BCM43362) },
|
|
{ BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4339) },
|
|
{ BRCM_CC_43430_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM43430) },
|
|
- { BRCM_CC_4345_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4345) },
|
|
+ { BRCM_CC_4345_CHIP_ID, 0xFFFFFFC0, BRCMF_FIRMWARE_NVRAM(BCM43455) },
|
|
{ BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4354) }
|
|
};
|
|
|