brcm80211: fmac: change firmware/nvram name to be more generic
The nvram file contains info for firmware which varies with different hardware designs. Use more common firmware/nvram file names instead of those in Linux firmware repository to avoid misunderstanding. Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
4c6e869d2e
commit
8dd939cade
|
@ -1,25 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2011 Broadcom Corporation
|
|
||||||
*
|
|
||||||
* Permission to use, copy, modify, and/or distribute this software for any
|
|
||||||
* purpose with or without fee is hereby granted, provided that the above
|
|
||||||
* copyright notice and this permission notice appear in all copies.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
||||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
||||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
|
||||||
* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
||||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
|
|
||||||
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
||||||
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _bcmchip_h_
|
|
||||||
#define _bcmchip_h_
|
|
||||||
|
|
||||||
/* bcm4329 */
|
|
||||||
/* firmware name */
|
|
||||||
#define BCM4329_FW_NAME "brcm/bcm4329-fullmac-4.bin"
|
|
||||||
#define BCM4329_NV_NAME "brcm/bcm4329-fullmac-4.txt"
|
|
||||||
|
|
||||||
#endif /* _bcmchip_h_ */
|
|
|
@ -43,7 +43,6 @@
|
||||||
#include "dhd_proto.h"
|
#include "dhd_proto.h"
|
||||||
#include "dhd_dbg.h"
|
#include "dhd_dbg.h"
|
||||||
#include "wl_cfg80211.h"
|
#include "wl_cfg80211.h"
|
||||||
#include "bcmchip.h"
|
|
||||||
|
|
||||||
MODULE_AUTHOR("Broadcom Corporation");
|
MODULE_AUTHOR("Broadcom Corporation");
|
||||||
MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN fullmac driver.");
|
MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN fullmac driver.");
|
||||||
|
@ -600,7 +599,6 @@ static void brcmf_ethtool_get_drvinfo(struct net_device *ndev,
|
||||||
|
|
||||||
sprintf(info->driver, KBUILD_MODNAME);
|
sprintf(info->driver, KBUILD_MODNAME);
|
||||||
sprintf(info->version, "%lu", drvr_priv->pub.drv_version);
|
sprintf(info->version, "%lu", drvr_priv->pub.drv_version);
|
||||||
sprintf(info->fw_version, "%s", BCM4329_FW_NAME);
|
|
||||||
sprintf(info->bus_info, "%s",
|
sprintf(info->bus_info, "%s",
|
||||||
dev_name(brcmf_bus_get_device(drvr_priv->pub.bus)));
|
dev_name(brcmf_bus_get_device(drvr_priv->pub.bus)));
|
||||||
}
|
}
|
||||||
|
|
|
@ -91,7 +91,6 @@ struct rte_console {
|
||||||
#include "dhd_bus.h"
|
#include "dhd_bus.h"
|
||||||
#include "dhd_proto.h"
|
#include "dhd_proto.h"
|
||||||
#include "dhd_dbg.h"
|
#include "dhd_dbg.h"
|
||||||
#include <bcmchip.h>
|
|
||||||
|
|
||||||
#define TXQLEN 2048 /* bulk tx queue length */
|
#define TXQLEN 2048 /* bulk tx queue length */
|
||||||
#define TXHI (TXQLEN - 256) /* turn on flow control above TXHI */
|
#define TXHI (TXQLEN - 256) /* turn on flow control above TXHI */
|
||||||
|
@ -310,6 +309,11 @@ struct rte_console {
|
||||||
/* Flags for SDH calls */
|
/* Flags for SDH calls */
|
||||||
#define F2SYNC (SDIO_REQ_4BYTE | SDIO_REQ_FIXED)
|
#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);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Conversion of 802.1D priority to precedence level
|
* Conversion of 802.1D priority to precedence level
|
||||||
*/
|
*/
|
||||||
|
@ -562,9 +566,7 @@ struct brcmf_bus {
|
||||||
|
|
||||||
struct semaphore sdsem;
|
struct semaphore sdsem;
|
||||||
|
|
||||||
const char *fw_name;
|
|
||||||
const struct firmware *firmware;
|
const struct firmware *firmware;
|
||||||
const char *nv_name;
|
|
||||||
u32 fw_ptr;
|
u32 fw_ptr;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -3125,9 +3127,6 @@ static int brcmf_sdbrcm_get_image(char *buf, int len, struct brcmf_bus *bus)
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|
||||||
MODULE_FIRMWARE(BCM4329_FW_NAME);
|
|
||||||
MODULE_FIRMWARE(BCM4329_NV_NAME);
|
|
||||||
|
|
||||||
static int brcmf_sdbrcm_download_code_file(struct brcmf_bus *bus)
|
static int brcmf_sdbrcm_download_code_file(struct brcmf_bus *bus)
|
||||||
{
|
{
|
||||||
int offset = 0;
|
int offset = 0;
|
||||||
|
@ -3137,8 +3136,7 @@ static int brcmf_sdbrcm_download_code_file(struct brcmf_bus *bus)
|
||||||
|
|
||||||
brcmf_dbg(INFO, "Enter\n");
|
brcmf_dbg(INFO, "Enter\n");
|
||||||
|
|
||||||
bus->fw_name = BCM4329_FW_NAME;
|
ret = request_firmware(&bus->firmware, BRCMFMAC_FW_NAME,
|
||||||
ret = request_firmware(&bus->firmware, bus->fw_name,
|
|
||||||
&bus->sdiodev->func[2]->dev);
|
&bus->sdiodev->func[2]->dev);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
brcmf_dbg(ERROR, "Fail to request firmware %d\n", ret);
|
brcmf_dbg(ERROR, "Fail to request firmware %d\n", ret);
|
||||||
|
@ -3235,8 +3233,7 @@ static int brcmf_sdbrcm_download_nvram(struct brcmf_bus *bus)
|
||||||
char *bufp;
|
char *bufp;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
bus->nv_name = BCM4329_NV_NAME;
|
ret = request_firmware(&bus->firmware, BRCMFMAC_NV_NAME,
|
||||||
ret = request_firmware(&bus->firmware, bus->nv_name,
|
|
||||||
&bus->sdiodev->func[2]->dev);
|
&bus->sdiodev->func[2]->dev);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
brcmf_dbg(ERROR, "Fail to request nvram %d\n", ret);
|
brcmf_dbg(ERROR, "Fail to request nvram %d\n", ret);
|
||||||
|
|
Reference in New Issue