Merge "touch: bengal: enable focaltech touch driver"

Android.mk

@@ -280,6 +280,17 @@ else ifeq ($(TARGET_BOARD_PLATFORM), bengal)
        include $(DLKM_DIR)/Build_external_kernelmodule.mk
        ###########################################################
 
+       ###########################################################
+       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
+       ###########################################################
+
 else ifeq ($(TARGET_BOARD_PLATFORM), trinket)
 
        ###########################################################

config/gki_bengaltouch.conf

@@ -3,3 +3,5 @@ export CONFIG_TOUCHSCREEN_SYNAPTICS_TCM=y
 export CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_I2C=y
 export CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_CORE=y
 export CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_TOUCH=y
+export CONFIG_TOUCH_FOCALTECH=y
+export CONFIG_TOUCHSCREEN_FTS_DIRECTORY="focaltech_touch"

config/gki_bengaltouchconf.h

@@ -7,3 +7,5 @@
 #define CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_I2C 1
 #define CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_CORE 1
 #define CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_TOUCH 1
+#define CONFIG_TOUCH_FOCALTECH 1
+#define CONFIG_TOUCHSCREEN_FTS_DIRECTORY "focaltech_touch"

touch_driver_board.mk

@@ -33,7 +33,8 @@ ifeq ($(TOUCH_DLKM_ENABLE),  true)
                                 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/goodix_ts.ko
                         else ifeq ($(TARGET_BOARD_PLATFORM), bengal)
                                 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/synaptics_tcm_ts.ko \
-                                        $(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko
+                                        $(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko \
+					$(KERNEL_MODULES_OUT)/focaltech_fts.ko
                         else ifeq ($(TARGET_BOARD_PLATFORM), trinket)
                                 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/synaptics_tcm_ts.ko
                         else ifeq ($(TARGET_BOARD_PLATFORM), pitti)

touch_driver_product.mk

@@ -31,7 +31,8 @@ ifeq ($(TOUCH_DLKM_ENABLE),  true)
                 PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/goodix_ts.ko
         else ifeq ($(TARGET_BOARD_PLATFORM), bengal)
                 PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/synaptics_tcm_ts.ko \
-                        $(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko
+                        $(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko \
+			$(KERNEL_MODULES_OUT)/focaltech_fts.ko
         else ifeq ($(TARGET_BOARD_PLATFORM), trinket)
                 PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/synaptics_tcm_ts.ko
         else ifeq ($(TARGET_BOARD_PLATFORM), pitti)