From 0fa67c986820fd318dea7ff7f40ff4813900bf81 Mon Sep 17 00:00:00 2001
From: daiss1 <daiss1@lenovo.com>
Date: Sun, 25 Apr 2021 11:01:43 +0800
Subject: [PATCH] ETS: Solve the compilation problem of androidR

Modify:
Solve the compilation problem of androidR

Change-Id: Ic24fa799ac614bc8c08d0656c7345d0efbef0f3b
Signed-off-by: daiss1 <daiss1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1931815
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 drivers/input/misc/ets_fps_mmi/Kbuild    | 4 ++--
 drivers/input/misc/ets_fps_mmi/ets_fps.c | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/input/misc/ets_fps_mmi/Kbuild b/drivers/input/misc/ets_fps_mmi/Kbuild
index 0cda93132709..43d13ca1ff94 100644
--- a/drivers/input/misc/ets_fps_mmi/Kbuild
+++ b/drivers/input/misc/ets_fps_mmi/Kbuild
@@ -1,7 +1,7 @@
 # add -Wall to try to catch everything we can.
 EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include \
-		-I$(TOP)/motorola/kernel/modules/drivers/input/misc/ets_fps_mmi
+EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include \
+		-I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/drivers/input/misc/ets_fps_mmi
 
 ifneq ($(filter m y,$(CONFIG_INPUT_EGISTEC_FPS_NAVI_HORIZON)),)
 	EXTRA_CFLAGS += -DCONFIG_INPUT_EGISTEC_FPS_NAVI_HORIZON
diff --git a/drivers/input/misc/ets_fps_mmi/ets_fps.c b/drivers/input/misc/ets_fps_mmi/ets_fps.c
index e8c30f4cabb9..93c8b02b1e61 100644
--- a/drivers/input/misc/ets_fps_mmi/ets_fps.c
+++ b/drivers/input/misc/ets_fps_mmi/ets_fps.c
@@ -22,6 +22,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/version.h>
 #include <linux/interrupt.h>
 #ifdef CONFIG_OF
 #include <linux/of.h>
@@ -44,7 +45,11 @@
 #include <linux/of_gpio.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
+#if KERNEL_VERSION(5, 4, 0) <= LINUX_VERSION_CODE
+#include <linux/qcom_scm.h>
+#else
 #include <soc/qcom/scm.h>
+#endif
 #ifdef CONFIG_HAS_WAKELOCK
 #include <linux/wakelock.h>
 #else