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-09 13:49:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "input: touchscreen: nt36xxx: Fix Propagation"

Browse source
This commit is contained in:
qctecmdr 2020-12-05 23:42:40 -08:00 • committed by Gerrit - the friendly Code Review server
commit cd70e1f455
7 changed files with 409 additions and 330 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/input/touchscreen/Kconfig
View file

@ -1330,4 +1330,6 @@ config TOUCHSCREEN_SYNAPTICS_DSX
source "drivers/input/touchscreen/synaptics_dsx/Kconfig"
source "drivers/input/touchscreen/nt36xxx/Kconfig"
endif

1
drivers/input/touchscreen/Makefile
View file

@ -114,3 +114,4 @@ obj-$(CONFIG_TOUCHSCREEN_ST) += st/
obj-$(CONFIG_TOUCHSCREEN_FTS) += focaltech_touch/
obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_TCM) += synaptics_tcm/
obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_DSX) += synaptics_dsx/
obj-$(CONFIG_TOUCHSCREEN_NT36XXX) += nt36xxx/

3
drivers/input/touchscreen/nt36xxx/Kconfig
View file

@ -2,9 +2,8 @@
#
# Novatek NT36xxx touchscreen driver configuration
#
config TOUCHSCREEN_NT36xxx
config TOUCHSCREEN_NT36XXX
bool "Novatek NT36xxx"
default y
help
Say Y here if you have a Novatek NT36xxx touchscreen connected
to your system.

2
drivers/input/touchscreen/nt36xxx/Makefile
View file

@ -5,4 +5,4 @@
# Each configuration option enables a list of files.
obj-$(CONFIG_TOUCHSCREEN_NT36xxx) += nt36xxx.o nt36xxx_fw_update.o nt36xxx_ext_proc.o nt36xxx_mp_ctrlram.o
obj-$(CONFIG_TOUCHSCREEN_NT36XXX) += nt36xxx.o nt36xxx_fw_update.o nt36xxx_ext_proc.o nt36xxx_mp_ctrlram.o

723
drivers/input/touchscreen/nt36xxx/nt36xxx.c
View file

File diff suppressed because it is too large Load diff

11
drivers/input/touchscreen/nt36xxx/nt36xxx.h
View file

@ -71,14 +71,14 @@ extern const uint16_t touch_key_array[TOUCH_KEY_NUM];
#define TOUCH_FORCE_NUM 1000
/* Enable only when module have tp reset pin and connected to host */
#define NVT_TOUCH_SUPPORT_HW_RST 0
#define NVT_TOUCH_SUPPORT_HW_RST 1
//---Customerized func.---
#define NVT_TOUCH_PROC 1
#define NVT_TOUCH_EXT_PROC 1
#define NVT_TOUCH_MP 1
#define MT_PROTOCOL_B 1
#define WAKEUP_GESTURE 1
#define WAKEUP_GESTURE 0
#if WAKEUP_GESTURE
extern const uint16_t gesture_key_array[];
#endif
@ -95,12 +95,11 @@ struct nvt_ts_data {
struct delayed_work nvt_fwu_work;
uint16_t addr;
int8_t phys[32];
#if defined(CONFIG_FB)
#ifdef _MSM_DRM_NOTIFY_H_
const struct i2c_device_id *id;
#if defined(CONFIG_DRM_PANEL)
struct notifier_block drm_notif;
#else
#elif defined(CONFIG_FB)
struct notifier_block fb_notif;
#endif
#elif defined(CONFIG_HAS_EARLYSUSPEND)
struct early_suspend early_suspend;
#endif

1
drivers/input/touchscreen/nt36xxx/nt36xxx_mp_ctrlram.c
View file

@ -532,7 +532,6 @@ static int32_t nvt_read_fw_noise(int32_t *xdata)
uint32_t y = 0;
int32_t iArrayIndex = 0;
int32_t frame_num = 0;
uint32_t rawdata_diff_min_offset = 0;
#if TOUCH_KEY_NUM > 0
int32_t k = 0;
#endif /* #if TOUCH_KEY_NUM > 0 */