Commit

reocat · Jan 12, 2024 · 8210f92 · 8210f92
1 parent 05e7953
commit 8210f92
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/arch/arm64/configs/nokia_defconfig b/arch/arm64/configs/nokia_defconfig
@@ -1961,12 +1961,13 @@ CONFIG_SECURE_TOUCH=y
 # CONFIG_TOUCHSCREEN_FT5X06 is not set
 # CONFIG_TOUCHSCREEN_IT7260_I2C is not set
 # CONFIG_TOUCHSCREEN_ST is not set
-CONFIG_TOUCHSCREEN_FTS=y
-CONFIG_TOUCHSCREEN_FTS_DIRECTORY="focaltech_touch"
+# CONFIG_TOUCHSCREEN_FTS=y
+# CONFIG_TOUCHSCREEN_FTS_DIRECTORY="focaltech_touch"
 CONFIG_TOUCHSCREEN_NT36xxx=y
 CONFIG_TOUCHSCREEN_GX=y
 CONFIG_TOUCHSCREEN_GX_DIRECTORY="gt1x"
-CONFIG_TOUCHSCREEN_FT8719=y
+# CONFIG_TOUCHSCREEN_FT8719=y
+CONFIG_DRM_PANEL_FT8716U=Y
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_BMA150 is not set

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
@@ -1229,9 +1229,6 @@ config TOUCHSCREEN_ST
 
 
 source "drivers/input/touchscreen/st/Kconfig"
-
-source "drivers/input/touchscreen/focaltech_touch/Kconfig"
 source "drivers/input/touchscreen/nt36xxx/Kconfig"
 source "drivers/input/touchscreen/gt1x/Kconfig"
-source "drivers/input/touchscreen/focaltech_touch_8719/Kconfig"
 endif
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
@@ -99,8 +99,6 @@ obj-$(CONFIG_TOUCHSCREEN_ZFORCE)	+= zforce_ts.o
 obj-$(CONFIG_TOUCHSCREEN_COLIBRI_VF50)	+= colibri-vf50-ts.o
 obj-$(CONFIG_TOUCHSCREEN_ROHM_BU21023)	+= rohm_bu21023.o
 obj-$(CONFIG_TOUCHSCREEN_ST)		+= st/
-obj-y += focaltech_touch/
 obj-$(CONFIG_TOUCHSCREEN_NT36xxx) += nt36xxx/
 obj-y += gt1x/
 obj-$(CONFIG_TOUCHSCREEN_GT9XX) += gt9xx/
-obj-$(CONFIG_TOUCHSCREEN_FT8719) += focaltech_touch_8719/