Commit c3552c06 authored by Luciano Coelho's avatar Luciano Coelho

wlcore/wl12xx: remove deprecated FW version check

We don't distinguish between STA and AP firmwares anymore, so the
firmware version checking and quirks setting in wl12xx isn't needed
anymore.

Remove implementation of .identify_fw in wl12xx and deprecated
definitions.  Don't remove the op entirely from wlcore, because it may
be needed for more fine-grained checking later.
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 986f3aa1
...@@ -1426,22 +1426,6 @@ static u32 wl12xx_sta_get_ap_rate_mask(struct wl1271 *wl, ...@@ -1426,22 +1426,6 @@ static u32 wl12xx_sta_get_ap_rate_mask(struct wl1271 *wl,
return wlvif->rate_set; return wlvif->rate_set;
} }
static int wl12xx_identify_fw(struct wl1271 *wl)
{
unsigned int *fw_ver = wl->chip.fw_ver;
/* Only new station firmwares support routing fw logs to the host */
if ((fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_STA) &&
(fw_ver[FW_VER_MINOR] < FW_VER_MINOR_FWLOG_STA_MIN))
wl->quirks |= WLCORE_QUIRK_FWLOG_NOT_IMPLEMENTED;
/* This feature is not yet supported for AP mode */
if (fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_AP)
wl->quirks |= WLCORE_QUIRK_FWLOG_NOT_IMPLEMENTED;
return 0;
}
static void wl12xx_conf_init(struct wl1271 *wl) static void wl12xx_conf_init(struct wl1271 *wl)
{ {
struct wl12xx_priv *priv = wl->priv; struct wl12xx_priv *priv = wl->priv;
...@@ -1626,7 +1610,6 @@ static int wl12xx_setup(struct wl1271 *wl); ...@@ -1626,7 +1610,6 @@ static int wl12xx_setup(struct wl1271 *wl);
static struct wlcore_ops wl12xx_ops = { static struct wlcore_ops wl12xx_ops = {
.setup = wl12xx_setup, .setup = wl12xx_setup,
.identify_chip = wl12xx_identify_chip, .identify_chip = wl12xx_identify_chip,
.identify_fw = wl12xx_identify_fw,
.boot = wl12xx_boot, .boot = wl12xx_boot,
.plt_init = wl12xx_plt_init, .plt_init = wl12xx_plt_init,
.trigger_cmd = wl12xx_trigger_cmd, .trigger_cmd = wl12xx_trigger_cmd,
......
...@@ -109,17 +109,6 @@ enum { ...@@ -109,17 +109,6 @@ enum {
NUM_FW_VER NUM_FW_VER
}; };
#define FW_VER_CHIP_WL127X 6
#define FW_VER_CHIP_WL128X 7
#define FW_VER_IF_TYPE_STA 1
#define FW_VER_IF_TYPE_AP 2
#define FW_VER_MINOR_1_SPARE_STA_MIN 58
#define FW_VER_MINOR_1_SPARE_AP_MIN 47
#define FW_VER_MINOR_FWLOG_STA_MIN 70
struct wl1271_chip { struct wl1271_chip {
u32 id; u32 id;
char fw_ver_str[ETHTOOL_BUSINFO_LEN]; char fw_ver_str[ETHTOOL_BUSINFO_LEN];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment