浏览代码

touch: support kalama platform

Add configuration files for Kalama project and suport only
NT36xxx touch driver.

Change-Id: Ieb25dd9e8c68a7a97fbffc7537223c1bd88f1596
Fei Mao 3 年之前
父节点
当前提交
16cd188263
共有 6 个文件被更改,包括 16 次插入28 次删除
  1. 0 22
      Android.mk
  2. 5 0
      Kbuild
  3. 2 0
      config/gki_kalamatouch.conf
  4. 7 0
      config/gki_kalamatouchconf.h
  5. 1 3
      touch_driver_board.mk
  6. 1 3
      touch_driver_product.mk

+ 0 - 22
Android.mk

@@ -24,28 +24,6 @@ KBUILD_OPTIONS += MODNAME=touch_dlkm
 KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM)
 KBUILD_OPTIONS += $(TOUCH_SELECT)
 
-###########################################################
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES   := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
-LOCAL_MODULE              := focaltech_fts.ko
-LOCAL_MODULE_KBUILD_NAME  := focaltech_fts.ko
-LOCAL_MODULE_TAGS         := optional
-#LOCAL_MODULE_DEBUG_ENABLE := true
-LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
-include $(DLKM_DIR)/Build_external_kernelmodule.mk
-###########################################################
-
-###########################################################
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES   := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
-LOCAL_MODULE              := synaptics_dsx.ko
-LOCAL_MODULE_KBUILD_NAME  := synaptics_dsx.ko
-LOCAL_MODULE_TAGS         := optional
-#LOCAL_MODULE_DEBUG_ENABLE := true
-LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
-include $(DLKM_DIR)/Build_external_kernelmodule.mk
-###########################################################
-
 ###########################################################
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES   := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)

+ 5 - 0
Kbuild

@@ -6,6 +6,11 @@ ifeq ($(CONFIG_ARCH_WAIPIO), y)
 	LINUX_INC += -include $(TOUCH_ROOT)/config/gki_waipiotouchconf.h
 endif
 
+#ifeq ($(CONFIG_ARCH_KALAMA), y)
+	include $(TOUCH_ROOT)/config/gki_kalamatouch.conf
+	LINUX_INC += -include $(TOUCH_ROOT)/config/gki_kalamatouchconf.h
+#endif
+
 LINUX_INC +=	-Iinclude/linux \
 		-Iinclude/linux/drm \
 		-Iinclude/linux/gunyah \

+ 2 - 0
config/gki_kalamatouch.conf

@@ -0,0 +1,2 @@
+export CONFIG_TOUCHSCREEN_NT36XXX_I2C=y
+export CONFIG_MSM_TOUCH=m

+ 7 - 0
config/gki_kalamatouchconf.h

@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2021, Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#define CONFIG_TOUCHSCREEN_NT36XXX_I2C 1
+

+ 1 - 3
touch_driver_board.mk

@@ -1,8 +1,6 @@
 
 ifneq ($(TARGET_BOARD_AUTO),true)
 	ifeq ($(call is-board-platform-in-list,$(TARGET_BOARD_PLATFORM)),true)
-		BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/focaltech_fts.ko \
-			$(KERNEL_MODULES_OUT)/synaptics_dsx.ko \
-			$(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko
+		BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko
 	endif
 endif

+ 1 - 3
touch_driver_product.mk

@@ -1,4 +1,2 @@
 
-PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/focaltech_fts.ko \
-	$(KERNEL_MODULES_OUT)/synaptics_dsx.ko \
-	$(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko
+PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko