Commit 52e1409f authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcm80211: fmac: make sdio firmware filename specific 



The sdio driver part uses firmware name brcmfmac.bin. With addition
of usb this name is too generic. This patch renames the filename
to brcmfmac-sdio.bin.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 71bb244b

drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

+6 −6
Original line number Diff line number Diff line
@@ -309,10 +309,10 @@ struct rte_console { 
/* Flags for SDH calls */

#define F2SYNC	(SDIO_REQ_4BYTE | SDIO_REQ_FIXED)



#define BRCMFMAC_FW_NAME	"brcm/brcmfmac.bin"

#define BRCMFMAC_NV_NAME	"brcm/brcmfmac.txt"

MODULE_FIRMWARE(BRCMFMAC_FW_NAME);

MODULE_FIRMWARE(BRCMFMAC_NV_NAME);

#define BRCMF_SDIO_FW_NAME	"brcm/brcmfmac-sdio.bin"

#define BRCMF_SDIO_NV_NAME	"brcm/brcmfmac-sdio.txt"

MODULE_FIRMWARE(BRCMF_SDIO_FW_NAME);

MODULE_FIRMWARE(BRCMF_SDIO_NV_NAME);



#define BRCMF_IDLE_IMMEDIATE	(-1)	/* Enter idle immediately */

#define BRCMF_IDLE_ACTIVE	0	/* Do not request any SD clock change
@@ -3202,7 +3202,7 @@ static int brcmf_sdbrcm_download_code_file(struct brcmf_sdio *bus) 


	brcmf_dbg(INFO, "Enter\n");



	ret = request_firmware(&bus->firmware, BRCMFMAC_FW_NAME,

	ret = request_firmware(&bus->firmware, BRCMF_SDIO_FW_NAME,

			       &bus->sdiodev->func[2]->dev);

	if (ret) {

		brcmf_dbg(ERROR, "Fail to request firmware %d\n", ret);
@@ -3299,7 +3299,7 @@ static int brcmf_sdbrcm_download_nvram(struct brcmf_sdio *bus) 
	char *bufp;

	int ret;



	ret = request_firmware(&bus->firmware, BRCMFMAC_NV_NAME,

	ret = request_firmware(&bus->firmware, BRCMF_SDIO_NV_NAME,

			       &bus->sdiodev->func[2]->dev);

	if (ret) {

		brcmf_dbg(ERROR, "Fail to request nvram %d\n", ret);