carl9170 firmware: enable 5GHZ PSM

The issue with 5GHZ PSM has been identified and fixed in
the previous commit (carl9170 firmware: fix time accouting).

Introduce a new feature flag, so the driver can check
for it.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>

diff --git a/carlfw/src/fw.c b/carlfw/src/fw.c
index b621813c1e1be339c4ee275dc652bd39e083ddc6..00bf940a5b9494c3ce73b31b6d0d9754b6df00d4 100644 (file)
--- a/carlfw/src/fw.c
+++ b/carlfw/src/fw.c
@@ -49,6 +49,7 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
 #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
                                        BIT(CARL9170FW_COMMAND_PHY) |
                                        BIT(CARL9170FW_PSM) |
+                                       BIT(CARL9170FW_FIXED_5GHZ_PSM) |
 #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
 #ifdef CONFIG_CARL9170FW_SECURITY_ENGINE
                                        BIT(CARL9170FW_COMMAND_CAM) |

diff --git a/include/shared/fwdesc.h b/include/shared/fwdesc.h
index a4769e9cee7c486e0840b59380a37515cf6e81fe..7ba62bb7705462130e226115ad4edb697d3667e6 100644 (file)
--- a/include/shared/fwdesc.h
+++ b/include/shared/fwdesc.h
@@ -72,6 +72,9 @@ enum carl9170fw_feature_list {
        /* Wake up on WLAN */
        CARL9170FW_WOL,
 
+       /* Firmware supports PSM in the 5GHZ Band */
+       CARL9170FW_FIXED_5GHZ_PSM,
+
        /* KEEP LAST */
        __CARL9170FW_FEATURE_NUM
 };

diff --git a/tools/src/fwinfo.c b/tools/src/fwinfo.c
index 90de57520e93980f8db517491cb0d26159446b00..5042978d05b503b2063cb029124f201a76e68dc0 100644 (file)
--- a/tools/src/fwinfo.c
+++ b/tools/src/fwinfo.c
@@ -66,6 +66,7 @@ static const struct feature_list known_otus_features_v1[] = {
        CHECK_FOR_FEATURE(CARL9170FW_PSM),
        CHECK_FOR_FEATURE(CARL9170FW_RX_FILTER),
        CHECK_FOR_FEATURE(CARL9170FW_WOL),
+       CHECK_FOR_FEATURE(CARL9170FW_FIXED_5GHZ_PSM),
 };
 
 static void check_feature_list(const struct carl9170fw_desc_head *head,