wlcore/wl12xx/wl18xx: verify multi-role and single-role fw versions
Previously we were only checking the single-role firmware version. Now add code to check for the firmware versions separately for each firmware type. Signed-off-by: Luciano Coelho <coelho@ti.com>
This commit is contained in:
@@ -653,9 +653,11 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
|
||||
/* read data preparation is only needed by wl127x */
|
||||
wl->ops->prepare_read = wl127x_prepare_read;
|
||||
|
||||
wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER, WL127X_IFTYPE_VER,
|
||||
WL127X_MAJOR_VER, WL127X_SUBTYPE_VER,
|
||||
WL127X_MINOR_VER);
|
||||
wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
|
||||
WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
|
||||
WL127X_SUBTYPE_SR_VER, WL127X_MINOR_SR_VER,
|
||||
WL127X_IFTYPE_MR_VER, WL127X_MAJOR_MR_VER,
|
||||
WL127X_SUBTYPE_MR_VER, WL127X_MINOR_MR_VER);
|
||||
break;
|
||||
|
||||
case CHIP_ID_127X_PG20:
|
||||
@@ -675,9 +677,11 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
|
||||
/* read data preparation is only needed by wl127x */
|
||||
wl->ops->prepare_read = wl127x_prepare_read;
|
||||
|
||||
wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER, WL127X_IFTYPE_VER,
|
||||
WL127X_MAJOR_VER, WL127X_SUBTYPE_VER,
|
||||
WL127X_MINOR_VER);
|
||||
wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
|
||||
WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
|
||||
WL127X_SUBTYPE_SR_VER, WL127X_MINOR_SR_VER,
|
||||
WL127X_IFTYPE_MR_VER, WL127X_MAJOR_MR_VER,
|
||||
WL127X_SUBTYPE_MR_VER, WL127X_MINOR_MR_VER);
|
||||
break;
|
||||
|
||||
case CHIP_ID_128X_PG20:
|
||||
@@ -693,9 +697,11 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
|
||||
WLCORE_QUIRK_TKIP_HEADER_SPACE |
|
||||
WLCORE_QUIRK_START_STA_FAILS;
|
||||
|
||||
wlcore_set_min_fw_ver(wl, WL128X_CHIP_VER, WL128X_IFTYPE_VER,
|
||||
WL128X_MAJOR_VER, WL128X_SUBTYPE_VER,
|
||||
WL128X_MINOR_VER);
|
||||
wlcore_set_min_fw_ver(wl, WL128X_CHIP_VER,
|
||||
WL128X_IFTYPE_SR_VER, WL128X_MAJOR_SR_VER,
|
||||
WL128X_SUBTYPE_SR_VER, WL128X_MINOR_SR_VER,
|
||||
WL128X_IFTYPE_MR_VER, WL128X_MAJOR_MR_VER,
|
||||
WL128X_SUBTYPE_MR_VER, WL128X_MINOR_MR_VER);
|
||||
break;
|
||||
case CHIP_ID_128X_PG10:
|
||||
default:
|
||||
|
Reference in New Issue
Block a user