From 23e8cd332847a3e41517588610412c65424e5a05 Mon Sep 17 00:00:00 2001
From: Naman Padhiar <quic_npadhiar@quicinc.com>
Date: Sat, 12 Mar 2022 08:34:35 +0530
Subject: [PATCH] wlan_platform: Add CONFIG_CNSS_OUT_OF_TREE flag

Use CONFIG_CNSS_OUT_OF_TREE to control if ICNSS family drivers are
built from in-kernel-tree source or out-of-kernel-tree source since
the exposed header files will be in different paths. This is also
for backward compatibility.
Resolve ICNSS compilation issue with msm-5.15 kernel.

Change-Id: I0a94f70c1be659a00f9401e57ee1dd31b6aa82ae
---
 icnss2/main.h | 4 ++++
 icnss2/qmi.c  | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/icnss2/main.h b/icnss2/main.h
index 27c4ef8161..d96c536dd5 100644
--- a/icnss2/main.h
+++ b/icnss2/main.h
@@ -10,7 +10,11 @@
 #include <linux/kobject.h>
 #include <linux/platform_device.h>
 #include <linux/ipc_logging.h>
+#ifdef CONFIG_CNSS_OUT_OF_TREE
+#include "icnss2.h"
+#else
 #include <soc/qcom/icnss2.h>
+#endif
 #include "wlan_firmware_service_v01.h"
 #include <linux/mailbox_client.h>
 
diff --git a/icnss2/qmi.c b/icnss2/qmi.c
index 478c03f6ce..f9f37aaf79 100644
--- a/icnss2/qmi.c
+++ b/icnss2/qmi.c
@@ -22,9 +22,11 @@
 #include <linux/firmware.h>
 #include <linux/soc/qcom/qmi.h>
 #include <linux/platform_device.h>
+#ifdef CONFIG_CNSS_OUT_OF_TREE
+#include "icnss2.h"
+#else
 #include <soc/qcom/icnss2.h>
-#include <soc/qcom/service-locator.h>
-#include <soc/qcom/service-notifier.h>
+#endif
 #include <soc/qcom/of_common.h>
 #include "wlan_firmware_service_v01.h"
 #include "main.h"