Browse Source

icnss2: Enable slate config for monaco

Enable SLATE_MODULE_ENABLED config for monaco.

Change-Id: Icb0b3f14d84a143bafe85fb5413a7406a087dfc5
CRs-Fixed: 3743739
Dundi Raviteja 1 year ago
parent
commit
47ca780fca
6 changed files with 14 additions and 5 deletions
  1. 1 1
      Kbuild
  2. 7 0
      icnss2/Kconfig
  3. 3 3
      icnss2/main.c
  4. 1 1
      icnss2/main.h
  5. 1 0
      icnss2/monaco_consolidate_defconfig
  6. 1 0
      icnss2/monaco_gki_defconfig

+ 1 - 1
Kbuild

@@ -79,7 +79,7 @@ KBUILD_CPPFLAGS += -DCONFIG_CNSS2_ENUM_WITH_LOW_SPEED
 endif
 
 ifeq ($(CONFIG_SLATE_MODULE_ENABLED), y)
-KBUILD_CPPFLAGS += -DSLATE_MODULE_ENABLED
+KBUILD_CPPFLAGS += -DCONFIG_SLATE_MODULE_ENABLED
 endif
 
 obj-$(CONFIG_CNSS2) += cnss2/

+ 7 - 0
icnss2/Kconfig

@@ -51,3 +51,10 @@ config WCNSS_MEM_PRE_ALLOC
 	  This feature enable cld wlan driver to use pre allocated memory
 	  for it's internal usage and release it to back to pre allocated pool.
 	  This memory is allocated at the cold boot time.
+
+config SLATE_MODULE_ENABLED
+	bool "Enable Slate usage"
+	depends on ICNSS2
+	help
+	  Enable slate compilation.
+	  This config enables slate code for compilation.

+ 3 - 3
icnss2/main.c

@@ -46,7 +46,7 @@
 #include <linux/remoteproc.h>
 #include <linux/version.h>
 #include <trace/hooks/remoteproc.h>
-#ifdef SLATE_MODULE_ENABLED
+#ifdef CONFIG_SLATE_MODULE_ENABLED
 #include <linux/soc/qcom/slatecom_interface.h>
 #include <linux/soc/qcom/slate_events_bridge_intf.h>
 #include <uapi/linux/slatecom_interface.h>
@@ -847,7 +847,7 @@ static enum wlfw_wlan_rf_subtype_v01 icnss_rf_subtype_value_to_type(u32 val)
 	}
 }
 
-#ifdef SLATE_MODULE_ENABLED
+#ifdef CONFIG_SLATE_MODULE_ENABLED
 static void icnss_send_wlan_boot_init(void)
 {
 	send_wlan_state(GMI_MGR_WLAN_BOOT_INIT);
@@ -2395,7 +2395,7 @@ static int icnss_wpss_ssr_register_notifier(struct icnss_priv *priv)
 	return ret;
 }
 
-#ifdef SLATE_MODULE_ENABLED
+#ifdef CONFIG_SLATE_MODULE_ENABLED
 static int icnss_slate_event_notifier_nb(struct notifier_block *nb,
 					 unsigned long event, void *data)
 {

+ 1 - 1
icnss2/main.h

@@ -519,7 +519,7 @@ struct icnss_priv {
 	u32 rf_subtype;
 	u8 is_slate_rfa;
 	struct completion slate_boot_complete;
-#ifdef SLATE_MODULE_ENABLED
+#ifdef CONFIG_SLATE_MODULE_ENABLED
 	struct seb_notif_info *seb_handle;
 	struct notifier_block seb_nb;
 #endif

+ 1 - 0
icnss2/monaco_consolidate_defconfig

@@ -4,3 +4,4 @@ CONFIG_ICNSS2_QMI=y
 CONFIG_CNSS_QMI_SVC=m
 CONFIG_CNSS_OUT_OF_TREE=y
 CONFIG_WCNSS_MEM_PRE_ALLOC=m
+CONFIG_SLATE_MODULE_ENABLED=y

+ 1 - 0
icnss2/monaco_gki_defconfig

@@ -3,3 +3,4 @@ CONFIG_ICNSS2_QMI=y
 CONFIG_CNSS_QMI_SVC=m
 CONFIG_CNSS_OUT_OF_TREE=y
 CONFIG_WCNSS_MEM_PRE_ALLOC=m
+CONFIG_SLATE_MODULE_ENABLED=y