Merge e6702160cf
on remote branch
Change-Id: Ia445bc9720d447402b429d350b79649602bec05e
Tento commit je obsažen v:
11
Android.mk
11
Android.mk
@@ -202,6 +202,17 @@ else ifeq ($(TARGET_BOARD_PLATFORM), blair)
|
||||
include $(DLKM_DIR)/Build_external_kernelmodule.mk
|
||||
###########################################################
|
||||
|
||||
###########################################################
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
|
||||
LOCAL_MODULE := goodix_ts.ko
|
||||
LOCAL_MODULE_KBUILD_NAME := goodix_ts.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), crow)
|
||||
|
||||
###########################################################
|
||||
|
@@ -5,5 +5,6 @@ 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_TOUCHSCREEN_GOODIX_BRL=y
|
||||
export CONFIG_TOUCHSCREEN_FTS_DIRECTORY="focaltech_touch"
|
||||
export CONFIG_FTS_TRUSTED_TOUCH=n
|
||||
|
@@ -9,4 +9,5 @@
|
||||
#define CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_I2C 1
|
||||
#define CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_CORE 1
|
||||
#define CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_TOUCH 1
|
||||
#define CONFIG_TOUCHSCREEN_GOODIX_BRL 1
|
||||
#define CONFIG_TOUCHSCREEN_FTS_DIRECTORY "focaltech_touch"
|
||||
|
@@ -2553,7 +2553,8 @@ if (active_panel)
|
||||
raydium_enable_regulator(g_raydium_ts, false);
|
||||
raydium_get_regulator(g_raydium_ts, false);
|
||||
|
||||
kfree(g_raydium_ts);
|
||||
devm_kfree(&client->dev, g_raydium_ts);
|
||||
g_raydium_ts = NULL;
|
||||
|
||||
i2c_set_clientdata(client, NULL);
|
||||
LOGD(LOG_INFO, "[touch] %s: done\n", __func__);
|
||||
@@ -2601,7 +2602,8 @@ if (active_panel)
|
||||
raydium_enable_regulator(g_raydium_ts, false);
|
||||
raydium_get_regulator(g_raydium_ts, false);
|
||||
|
||||
kfree(g_raydium_ts);
|
||||
devm_kfree(&client->dev, g_raydium_ts);
|
||||
g_raydium_ts = NULL;
|
||||
|
||||
i2c_set_clientdata(client, NULL);
|
||||
LOGD(LOG_INFO, "[touch] %s: done\n", __func__);
|
||||
|
@@ -26,7 +26,8 @@ ifeq ($(TOUCH_DLKM_ENABLE), true)
|
||||
else ifeq ($(TARGET_BOARD_PLATFORM), blair)
|
||||
BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/focaltech_fts.ko \
|
||||
$(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko \
|
||||
$(KERNEL_MODULES_OUT)/synaptics_tcm_ts.ko
|
||||
$(KERNEL_MODULES_OUT)/synaptics_tcm_ts.ko \
|
||||
$(KERNEL_MODULES_OUT)/goodix_ts.ko
|
||||
else ifeq ($(TARGET_BOARD_PLATFORM), crow)
|
||||
BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/goodix_ts.ko
|
||||
else ifeq ($(TARGET_BOARD_PLATFORM), bengal)
|
||||
|
@@ -24,7 +24,8 @@ ifeq ($(TOUCH_DLKM_ENABLE), true)
|
||||
else ifeq ($(TARGET_BOARD_PLATFORM), blair)
|
||||
PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/focaltech_fts.ko \
|
||||
$(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko \
|
||||
$(KERNEL_MODULES_OUT)/synaptics_tcm_ts.ko
|
||||
$(KERNEL_MODULES_OUT)/synaptics_tcm_ts.ko \
|
||||
$(KERNEL_MODULES_OUT)/goodix_ts.ko
|
||||
else ifeq ($(TARGET_BOARD_PLATFORM), crow)
|
||||
PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/goodix_ts.ko
|
||||
else ifeq ($(TARGET_BOARD_PLATFORM), bengal)
|
||||
|
Odkázat v novém úkolu
Zablokovat Uživatele