From: Christian Lamparter <chunkeey@googlemail.com>
Date: Sat, 5 Mar 2011 23:34:21 +0000 (+0100)
Subject: carl9170 firmware: update feature descriptor
X-Git-Tag: 1.9.4~26^2~6
X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=commitdiff_plain;h=286d1cba9fb3df4b7bdf4321cbb5fb5965513b30

carl9170 firmware: update feature descriptor

 * CARL9170FW_PSM depends on RF

 * bump OTAR header revision

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

diff --git a/carlfw/src/fw.c b/carlfw/src/fw.c
index aed674f..a934687 100644
--- a/carlfw/src/fw.c
+++ b/carlfw/src/fw.c
@@ -35,7 +35,6 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
 	FILL(otus, OTUS,
 	     .feature_set = cpu_to_le32(BIT(CARL9170FW_DUMMY_FEATURE) |
 					BIT(CARL9170FW_USB_RESP_EP2) |
-					BIT(CARL9170FW_PSM) |
 					BIT(CARL9170FW_RX_FILTER) |
 #ifdef CONFIG_CARL9170FW_USB_INIT_FIRMWARE
 					BIT(CARL9170FW_USB_INIT_FIRMWARE) |
@@ -48,6 +47,7 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
 #endif /* CONFIG_CARL9170FW_USB_INIT_FIRMWARE */
 #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
 					BIT(CARL9170FW_COMMAND_PHY) |
+					BIT(CARL9170FW_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 94438b5..9cfe366 100644
--- a/include/shared/fwdesc.h
+++ b/include/shared/fwdesc.h
@@ -104,7 +104,7 @@ struct carl9170fw_desc_head {
 	(sizeof(struct carl9170fw_desc_head))
 
 #define CARL9170FW_OTUS_DESC_MIN_VER		6
-#define CARL9170FW_OTUS_DESC_CUR_VER		6
+#define CARL9170FW_OTUS_DESC_CUR_VER		7
 struct carl9170fw_otus_desc {
 	struct carl9170fw_desc_head head;
 	__le32 feature_set;