Browse Source

icnss2: include qcom_aoss.h file at correct place

For bengal target, getting compilation error due to
Change-Id: Ifc5ff95208e79280543471d56fdb0a87ca973cf5, resulting in
multiple time inclusion of inline definition of the APIs defined in
the header file qcom_aoss.h. This is resulting in linking error.
Move the header file to the correct place in power.c.

Change-Id: I5a0f83fa954feb4656af09527c090f8e7d96bab8
CRs-Fixed: 3595936
Prateek Patil 1 year ago
parent
commit
e44a22665b
2 changed files with 3 additions and 1 deletions
  1. 0 1
      icnss2/main.h
  2. 3 0
      icnss2/power.c

+ 0 - 1
icnss2/main.h

@@ -14,7 +14,6 @@
 #include <linux/power_supply.h>
 #if IS_ENABLED(CONFIG_MSM_QMP)
 #include <linux/mailbox/qmp.h>
-#include <linux/soc/qcom/qcom_aoss.h>
 #endif
 #ifdef CONFIG_CNSS_OUT_OF_TREE
 #include "icnss2.h"

+ 3 - 0
icnss2/power.c

@@ -13,6 +13,9 @@
 #include "qmi.h"
 #include "debug.h"
 #include "power.h"
+#if IS_ENABLED(CONFIG_MSM_QMP)
+#include <linux/soc/qcom/qcom_aoss.h>
+#endif
 
 static struct icnss_vreg_cfg icnss_wcn6750_vreg_list[] = {
 	{"vdd-cx-mx", 824000, 952000, 0, 0, 0, false, true},