A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

dlkm: Himax 0Flash touch improvement

Browse source 
- Rename some macros for avoid conflicts with other driver and correct
macro for hx83112f.

Change-Id: I41f68b0fd30c2ef192466f0d60f977305fd81297
Signed-off-by: wengjun1 <wengjun1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1544078
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Jianqiu Huang <huangjq9@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
wengjun1 2020-04-28 18:35:43 +08:00 • committed by Jun Weng
commit cb2f525a09
10 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/input/touchscreen/himax_0flash_mmi/Android.mk
View file

@ -8,26 +8,26 @@ HIMAX_MMI_MODULE_PATH := $(KERNEL_MODULES_OUT)
endif
ifeq ($(HIMAX_V2_MMI_0FLASH),true)
KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_HIMAX_V2_MMI_0FLASH=y
KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_HIMAX_0FLASH_MMI_0FLASH=y
endif
ifneq ($(BOARD_USES_TOUCH_PALM),)
KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_HIMAX_V2_MMI_ENABLE_PALM=y
KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_HIMAX_0FLASH_MMI_ENABLE_PALM=y
endif
ifneq ($(BOARD_USES_DOUBLE_TAP),)
KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_V2_MMI_ENABLE_DOUBLE_TAP=y
KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_0FLASH_MMI_ENABLE_DOUBLE_TAP=y
endif
ifneq ($(BOARD_USES_HIMAX_MULTI_BIN),)
KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_V2_MMI_ENABLE_MULTI_BIN=y
KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_0FLASH_MMI_ENABLE_MULTI_BIN=y
endif
ifeq ($(HIMAX_V2_MMI_HX83102D),true)
KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_D=hx83102d
KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME_D=hx83102d
endif
ifeq ($(HIMAX_V2_MMI_HX83112F),true)
KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_F=hx83112f
KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME=hx83112f
endif
ifneq ($(BOARD_USES_PANEL_NOTIFICATIONS),)

16
drivers/input/touchscreen/himax_0flash_mmi/Kbuild
View file

@ -8,7 +8,7 @@ EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_DEBUG \
EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_INCELL
EXTRA_CFLAGS += -DCONFIG_HMX_DB
ifneq ($(filter hx83112f,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_F)),)
ifneq ($(filter hx83112f,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME)),)
EXTRA_CFLAGS += -D__HIMAX_HX83112_MOD__
EXTRA_CFLAGS += -DHX_FIX_TOUCH_INFO
EXTRA_CFLAGS += -DHX_112F_SET
@ -16,28 +16,28 @@ ifneq ($(filter hx83112f,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_F)),)
EXTRA_CFLAGS += -DFIX_WVLA
endif
ifneq ($(filter hx83112,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME)),)
ifneq ($(filter hx83112,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME)),)
EXTRA_CFLAGS += -D__HIMAX_HX83112_MOD__
endif
ifneq ($(filter hx83102,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME)),)
ifneq ($(filter hx83102,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME)),)
EXTRA_CFLAGS += -D__HIMAX_HX83102_MOD__
endif
ifneq ($(filter hx83102d,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_D)),)
ifneq ($(filter hx83102d,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME_D)),)
EXTRA_CFLAGS += -D__HIMAX_HX83102D_MOD__
EXTRA_CFLAGS += -DHX_CODE_OVERLAY
endif
ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_HIMAX_V2_MMI_ENABLE_PALM)),)
ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_HIMAX_0FLASH_MMI_ENABLE_PALM)),)
EXTRA_CFLAGS += -DHIMAX_PALM_SENSOR_EN
endif
ifneq ($(filter m y,$(CONFIG_INPUT_HIMAX_V2_MMI_ENABLE_DOUBLE_TAP)),)
ifneq ($(filter m y,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_ENABLE_DOUBLE_TAP)),)
EXTRA_CFLAGS += -DHIMAX_V2_SENSOR_EN
endif
ifneq ($(filter m y,$(CONFIG_INPUT_HIMAX_V2_MMI_ENABLE_MULTI_BIN)),)
ifneq ($(filter m y,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_ENABLE_MULTI_BIN)),)
EXTRA_CFLAGS += -DHIMAX_V2_MULTI_BIN
endif
@ -47,7 +47,7 @@ endif
obj-m := himax_0flash_mmi.o
ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_HIMAX_V2_MMI_0FLASH)),)
ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_HIMAX_0FLASH_MMI_0FLASH)),)
himax_0flash_mmi-objs += himax_platform_QCT_SPI.o
EXTRA_CFLAGS += -D__HIMAX_PLATFORM_SPI__ \
-DHX_ZERO_FLASH

4
drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102/Android.mk
View file

@ -7,7 +7,9 @@ else
HIMAX_MMI_IC_MODULE_PATH := $(KERNEL_MODULES_OUT)
endif
KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME=hx83102
ifeq ($(HIMAX_V2_MMI_HX83102),true)
KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME=hx83102
endif
include $(CLEAR_VARS)
LOCAL_MODULE := himax_0flash_mmi_hx83102.ko

2
drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102/Kbuild
View file

@ -10,7 +10,7 @@ EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_DEBUG \
EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_INCELL
EXTRA_CFLAGS += -DCONFIG_HMX_DB
ifneq ($(filter hx83102,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME)),)
ifneq ($(filter hx83102,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME)),)
EXTRA_CFLAGS += -D__HIMAX_HX83102_MOD__
endif

4
drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102d/Android.mk
View file

@ -7,8 +7,8 @@ else
HIMAX_MMI_IC_MODULE_PATH := $(KERNEL_MODULES_OUT)
endif
ifneq ($(filter hx83102d,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_D)),)
KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_D=hx83102d
ifeq ($(HIMAX_V2_MMI_HX83102D),true)
KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME_D=hx83102d
endif

2
drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102d/Kbuild
View file

@ -10,7 +10,7 @@ EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_DEBUG \
EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_INCELL
EXTRA_CFLAGS += -DCONFIG_HMX_DB
ifneq ($(filter hx83102d,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_D)),)
ifneq ($(filter hx83102d,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME_D)),)
EXTRA_CFLAGS += -D__HIMAX_HX83102D_MOD__
EXTRA_CFLAGS += -DHX_ZERO_FLASH
EXTRA_CFLAGS += -DHX_CODE_OVERLAY

6
drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112/Android.mk
View file

@ -7,10 +7,12 @@ else
HIMAX_MMI_IC_MODULE_PATH := $(KERNEL_MODULES_OUT)
endif
KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME=hx83112
ifeq ($(HIMAX_V2_MMI_HX83112),true)
KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME=hx83112
endif
ifneq ($(BOARD_USES_TOUCH_PALM),)
KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_HIMAX_V2_MMI_ENABLE_PALM=y
KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_HIMAX_0FLASH_MMI_ENABLE_PALM=y
endif
include $(CLEAR_VARS)

4
drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112/Kbuild
View file

@ -10,11 +10,11 @@ EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_DEBUG \
EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_INCELL
EXTRA_CFLAGS += -DCONFIG_HMX_DB
ifneq ($(filter hx83112,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME)),)
ifneq ($(filter hx83112,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME)),)
EXTRA_CFLAGS += -D__HIMAX_HX83112_MOD__
endif
ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_HIMAX_V2_MMI_ENABLE_PALM)),)
ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_HIMAX_0FLASH_MMI_ENABLE_PALM)),)
EXTRA_CFLAGS += -DHIMAX_PALM_SENSOR_EN
endif

6
drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112f/Android.mk
View file

@ -7,10 +7,12 @@ else
HIMAX_MMI_IC_MODULE_PATH := $(KERNEL_MODULES_OUT)
endif
KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_F=hx83112f
ifeq ($(HIMAX_V2_MMI_HX83112F),true)
KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME=hx83112f
endif
ifneq ($(BOARD_USES_TOUCH_PALM),)
KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_HIMAX_V2_MMI_ENABLE_PALM=y
KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_HIMAX_0FLASH_MMI_ENABLE_PALM=y
endif
include $(CLEAR_VARS)

4
drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112f/Kbuild
View file

@ -10,13 +10,13 @@ EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_DEBUG \
EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_INCELL
EXTRA_CFLAGS += -DCONFIG_HMX_DB
ifneq ($(filter hx83112f,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_F)),)
ifneq ($(filter hx83112f,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME)),)
EXTRA_CFLAGS += -D__HIMAX_HX83112_MOD__
EXTRA_CFLAGS += -DHX_112F_SET
EXTRA_CFLAGS += -DHX_ZERO_FLASH
endif
ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_HIMAX_V2_MMI_ENABLE_PALM)),)
ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_HIMAX_0FLASH_MMI_ENABLE_PALM)),)
EXTRA_CFLAGS += -DHIMAX_PALM_SENSOR_EN
endif