Commit e28b5c8d authored by Jeff LaBundy's avatar Jeff LaBundy Committed by Dmitry Torokhov
Browse files

Input: touchscreen - move helper functions to core 

Some devices outside of drivers/input/touchscreen/ can still make
use of the touchscreen helper functions. Therefore, it was agreed
in [1] to move them outside of drivers/input/touchscreen/ so that
other devices can call them without INPUT_TOUCHSCREEN being set.

As part of this change, 'of' is dropped from the filename because
the helpers no longer actually use OF. No changes are made to the
file contents whatsoever.

Based on the feedback in [2], the corresponding binding documents
(touchscreen.yaml and touchscreen.txt) are left in their original
locations.

[1] https://patchwork.kernel.org/patch/11924029/
[2] https://patchwork.kernel.org/patch/12042037/



Signed-off-by: default avatarJeff LaBundy <jeff@labundy.com>
Link: https://lore.kernel.org/r/20210301234928.4298-2-jeff@labundy.com


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent c75cf862

drivers/input/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


obj-$(CONFIG_INPUT)		+= input-core.o

input-core-y := input.o input-compat.o input-mt.o input-poller.o ff-core.o

input-core-y += touchscreen.o



obj-$(CONFIG_INPUT_FF_MEMLESS)	+= ff-memless.o

obj-$(CONFIG_INPUT_SPARSEKMAP)	+= sparse-keymap.o

drivers/input/touchscreen/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ menuconfig INPUT_TOUCHSCREEN 


if INPUT_TOUCHSCREEN



config TOUCHSCREEN_PROPERTIES

	def_tristate INPUT

	depends on INPUT



config TOUCHSCREEN_88PM860X

	tristate "Marvell 88PM860x touchscreen"

	depends on MFD_88PM860X

drivers/input/touchscreen/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 


wm97xx-ts-y := wm97xx-core.o



obj-$(CONFIG_TOUCHSCREEN_PROPERTIES)	+= of_touchscreen.o

obj-$(CONFIG_TOUCHSCREEN_88PM860X)	+= 88pm860x-ts.o

obj-$(CONFIG_TOUCHSCREEN_AD7877)	+= ad7877.o

obj-$(CONFIG_TOUCHSCREEN_AD7879)	+= ad7879.o