Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44abfd81 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "input: touchscreen: Enable Novatek nt36xxx Module"

parents 5fc6f0ee e460611b

arch/arm64/configs/vendor/lahaina_GKI.config

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ CONFIG_TOUCHSCREEN_FTS=m 
CONFIG_FTS_TRUSTED_TOUCH=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=m

CONFIG_TOUCHSCREEN_SYNAPTICS_DSX=m

CONFIG_TOUCHSCREEN_NT36XXX=y

CONFIG_TOUCHSCREEN_NT36XXX=m

CONFIG_SPS=m

CONFIG_SPS_SUPPORT_NDP_BAM=y

# CONFIG_SPS_SUPPORT_BAMDMA is not set

drivers/input/touchscreen/nt36xxx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# Novatek NT36xxx touchscreen driver configuration

#

config TOUCHSCREEN_NT36XXX

	bool "Novatek NT36xxx"

	tristate "Novatek NT36xxx"

	help

	  Say Y here if you have a Novatek NT36xxx touchscreen connected

	  to your system.

drivers/input/touchscreen/nt36xxx/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -5,4 +5,6 @@ 


# 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) += nvt_36xxx.o



nvt_36xxx-y := nt36xxx.o nt36xxx_fw_update.o nt36xxx_ext_proc.o nt36xxx_mp_ctrlram.o

drivers/input/touchscreen/nt36xxx/nt36xxx.c

+1 −0
Original line number Diff line number Diff line
@@ -1984,3 +1984,4 @@ late_initcall(nvt_driver_init); 
module_exit(nvt_driver_exit);



MODULE_DESCRIPTION("Novatek Touchscreen Driver");

MODULE_LICENSE("GPL v2");