Merge 97be5ba4d252ddda07c74a6a8cc69bdd248f8280 on remote branch

Change-Id: Icdfbbd5f6fcface19b1532ac65144053a2435683

Android.mk

@@ -330,6 +330,17 @@ else ifeq ($(TARGET_BOARD_PLATFORM), volcano)
        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
 
        ###########################################################

Kbuild

@@ -46,6 +46,11 @@ ifeq ($(CONFIG_ARCH_TRINKET), y)
         LINUX_INC += -include $(TOUCH_ROOT)/config/gki_trinkettouchconf.h
 endif
 
+ifeq ($(CONFIG_ARCH_BENGAL), y)
+        include $(TOUCH_ROOT)/config/gki_bengaltouch.conf
+        LINUX_INC += -include $(TOUCH_ROOT)/config/gki_bengaltouchconf.h
+endif
+
 LINUX_INC +=	-Iinclude/linux \
 		-Iinclude/linux/drm \
 		-Iinclude/linux/gunyah \

config/gki_bengaltouch.conf

@@ -0,0 +1,5 @@
+export CONFIG_MSM_TOUCH=m
+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

config/gki_bengaltouchconf.h

@@ -0,0 +1,9 @@
+/*
+* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+* SPDX-License-Identifier: GPL-2.0-only
+*/
+
+#define CONFIG_TOUCHSCREEN_SYNAPTICS_TCM 1
+#define CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_I2C 1
+#define CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_CORE 1
+#define CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_TOUCH 1

pt/pt_platform.c

@@ -1039,7 +1039,7 @@ int pt_setup_irq(struct pt_core_platform_data *pdata, int on,
 			/* use edge triggered interrupts */
 			irq_flags = IRQF_TRIGGER_FALLING;
 		rc = request_threaded_irq(cd->irq, NULL, pt_irq,
-			irq_flags | IRQF_ONESHOT | IRQF_NO_SUSPEND, dev_name(dev), cd);
+			irq_flags | IRQF_ONESHOT, dev_name(dev), cd);
 		if (rc < 0)
 			pt_debug(dev, DL_ERROR,
 				"%s: Error, could not request irq\n", __func__);

raydium/raydium_driver.c

@@ -2468,7 +2468,7 @@ static int raydium_ts_probe(struct i2c_client *client,
 
 	g_raydium_ts->irq = gpio_to_irq(pdata->irq_gpio);
 	ret = request_threaded_irq(g_raydium_ts->irq, NULL, raydium_ts_interrupt,
-				   IRQF_TRIGGER_FALLING | IRQF_ONESHOT | IRQF_NO_SUSPEND,
+				   IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
 				   client->dev.driver->name, g_raydium_ts);
 	if (ret < 0) {
 		LOGD(LOG_ERR, "[touch]raydium_probe: request irq failed\n");

target.bzl

@@ -11,7 +11,8 @@ def define_pineapple(t,v):
             "nt36xxx-i2c",
             "atmel_mxt_ts",
             "dummy_ts",
-            "goodix_ts"
+            "goodix_ts",
+            "focaltech_fts"
         ],
         config_options = [
             "TOUCH_DLKM_ENABLE",
@@ -20,7 +21,8 @@ def define_pineapple(t,v):
             "CONFIG_TOUCHSCREEN_GOODIX_BRL",
             "CONFIG_TOUCHSCREEN_NT36XXX_I2C",
             "CONFIG_TOUCHSCREEN_ATMEL_MXT",
-            "CONFIG_TOUCHSCREEN_DUMMY"
+            "CONFIG_TOUCHSCREEN_DUMMY",
+            "CONFIG_TOUCH_FOCALTECH"
         ],
 )
 

touch_driver_board.mk

@@ -40,7 +40,8 @@ ifeq ($(TOUCH_DLKM_ENABLE),  true)
                                 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/focaltech_fts.ko \
                                         $(KERNEL_MODULES_OUT)/goodix_ts.ko
                         else ifeq ($(TARGET_BOARD_PLATFORM), volcano)
-                                BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/goodix_ts.ko
+                                BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/goodix_ts.ko \
+                                        $(KERNEL_MODULES_OUT)/focaltech_fts.ko
                         else
                                 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko \
                                         $(KERNEL_MODULES_OUT)/goodix_ts.ko \

touch_driver_product.mk

@@ -38,7 +38,8 @@ ifeq ($(TOUCH_DLKM_ENABLE),  true)
                 PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/focaltech_fts.ko \
                         $(KERNEL_MODULES_OUT)/goodix_ts.ko
         else ifeq ($(TARGET_BOARD_PLATFORM), volcano)
-                PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/goodix_ts.ko
+                PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/goodix_ts.ko \
+                        $(KERNEL_MODULES_OUT)/focaltech_fts.ko
         else
                 PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko \
                         $(KERNEL_MODULES_OUT)/goodix_ts.ko \