Merge "input: touchscreen: Remove linking across different modules" (fb456054) · Commits · e / devices / android_kernel_fairphone_FP5

arch/arm64/configs/vendor/holi_GKI.config

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -126,6 +126,17 @@ CONFIG_HEADER_TEST=y
	CONFIG_HEADERS_INSTALL=y		CONFIG_HEADERS_INSTALL=y
	CONFIG_KERNEL_HEADER_TEST=y		CONFIG_KERNEL_HEADER_TEST=y
	CONFIG_INPUT_TOUCHSCREEN=y		CONFIG_INPUT_TOUCHSCREEN=y
			CONFIG_TOUCHSCREEN_SYNAPTICS_TCM=m
			CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_SPI=m
			CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_I2C=m
			CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_CORE=m
			CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_TOUCH=m
			CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_DEVICE=m
			CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_TESTING=m
			CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_REFLASH=m
			CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_RECOVERY=m
			CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_ZEROFLASH=m
			CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_DIAGNOSTICS=m
	CONFIG_TOUCHSCREEN_SYNAPTICS_DSX=y		CONFIG_TOUCHSCREEN_SYNAPTICS_DSX=y
	# CONFIG_TOUCHSCREEN_PROPERTIES is not set		# CONFIG_TOUCHSCREEN_PROPERTIES is not set
	CONFIG_TOUCHSCREEN_USB_COMPOSITE=m		CONFIG_TOUCHSCREEN_USB_COMPOSITE=m

drivers/input/touchscreen/Kconfig

+0 −12

Original line number	Original line	Diff line number	Diff line
	@@ -1314,18 +1314,6 @@ source "drivers/input/touchscreen/st/Kconfig"

	source "drivers/input/touchscreen/focaltech_touch/Kconfig"		source "drivers/input/touchscreen/focaltech_touch/Kconfig"

	config TOUCHSCREEN_SYNAPTICS_TCM
	bool "Synaptics TCM Touchscreen Driver"
	depends on I2C
	default y
	help
	Say Y here if you have a Synaptics Touchscreen.

	If unsure, say N.

	To compile this driver as a module, choose M here: the
	module will be called synaptics_tcm.

	source "drivers/input/touchscreen/synaptics_tcm/Kconfig"		source "drivers/input/touchscreen/synaptics_tcm/Kconfig"

	config TOUCHSCREEN_SYNAPTICS_DSX		config TOUCHSCREEN_SYNAPTICS_DSX

drivers/input/touchscreen/synaptics_tcm/Kconfig

+3 −13

Original line number	Original line	Diff line number	Diff line
	@@ -2,21 +2,18 @@
	# Synaptics TCM touchscreen driver configuration		# Synaptics TCM touchscreen driver configuration
	#		#
	menuconfig TOUCHSCREEN_SYNAPTICS_TCM		menuconfig TOUCHSCREEN_SYNAPTICS_TCM
	bool "Synaptics TCM touchscreen"		tristate "Synaptics TCM touchscreen"
	default y
	help		help
	Say Y here if you have a Synaptics TCM touchscreen connected		Say Y here if you have a Synaptics TCM touchscreen connected
	to your system.		to your system.

	If unsure, say N.		If unsure, say N.

	if TOUCHSCREEN_SYNAPTICS_TCM

	choice		choice
	default TOUCHSCREEN_SYNAPTICS_TCM_I2C		default TOUCHSCREEN_SYNAPTICS_TCM_I2C
	prompt "Synaptics TCM bus module"		prompt "Synaptics TCM bus module"
	config TOUCHSCREEN_SYNAPTICS_TCM_I2C		config TOUCHSCREEN_SYNAPTICS_TCM_I2C
	bool "I2C"		tristate "I2C"
	depends on I2C		depends on I2C
	help		help
	Say Y here to use I2C bus for communication.		Say Y here to use I2C bus for communication.
	@@ -27,7 +24,7 @@ config TOUCHSCREEN_SYNAPTICS_TCM_I2C
	with touch controller.		with touch controller.

	config TOUCHSCREEN_SYNAPTICS_TCM_SPI		config TOUCHSCREEN_SYNAPTICS_TCM_SPI
	bool "SPI"		tristate "SPI"
	depends on SPI_MASTER		depends on SPI_MASTER
	help		help
	Say Y here to use SPI bus for communication.		Say Y here to use SPI bus for communication.
	@@ -42,7 +39,6 @@ endchoice
	config TOUCHSCREEN_SYNAPTICS_TCM_CORE		config TOUCHSCREEN_SYNAPTICS_TCM_CORE
	tristate "Synaptics TCM core module"		tristate "Synaptics TCM core module"
	depends on I2C \|\| SPI_MASTER		depends on I2C \|\| SPI_MASTER
	default y
	help		help
	Say Y here to enable core functionality.		Say Y here to enable core functionality.

	@@ -54,7 +50,6 @@ config TOUCHSCREEN_SYNAPTICS_TCM_CORE
	config TOUCHSCREEN_SYNAPTICS_TCM_TOUCH		config TOUCHSCREEN_SYNAPTICS_TCM_TOUCH
	tristate "Synaptics TCM touch module"		tristate "Synaptics TCM touch module"
	depends on TOUCHSCREEN_SYNAPTICS_TCM_CORE		depends on TOUCHSCREEN_SYNAPTICS_TCM_CORE
	default y
	help		help
	Say Y here to enable support for touch reporting.		Say Y here to enable support for touch reporting.

	@@ -66,7 +61,6 @@ config TOUCHSCREEN_SYNAPTICS_TCM_TOUCH
	config TOUCHSCREEN_SYNAPTICS_TCM_DEVICE		config TOUCHSCREEN_SYNAPTICS_TCM_DEVICE
	tristate "Synaptics TCM device module"		tristate "Synaptics TCM device module"
	depends on TOUCHSCREEN_SYNAPTICS_TCM_CORE		depends on TOUCHSCREEN_SYNAPTICS_TCM_CORE
	default y
	help		help
	Say Y here to enable support for TCM device functionality.		Say Y here to enable support for TCM device functionality.

	@@ -89,7 +83,6 @@ config TOUCHSCREEN_SYNAPTICS_TCM_TESTING
	config TOUCHSCREEN_SYNAPTICS_TCM_REFLASH		config TOUCHSCREEN_SYNAPTICS_TCM_REFLASH
	tristate "Synaptics TCM reflash module"		tristate "Synaptics TCM reflash module"
	depends on TOUCHSCREEN_SYNAPTICS_TCM_CORE		depends on TOUCHSCREEN_SYNAPTICS_TCM_CORE
	default y
	help		help
	Say Y here to enable support for reflash functionality.		Say Y here to enable support for reflash functionality.

	@@ -101,7 +94,6 @@ config TOUCHSCREEN_SYNAPTICS_TCM_REFLASH
	config TOUCHSCREEN_SYNAPTICS_TCM_RECOVERY		config TOUCHSCREEN_SYNAPTICS_TCM_RECOVERY
	tristate "Synaptics TCM recovery module"		tristate "Synaptics TCM recovery module"
	depends on TOUCHSCREEN_SYNAPTICS_TCM_CORE		depends on TOUCHSCREEN_SYNAPTICS_TCM_CORE
	default y
	help		help
	Say Y here to enable support for recovery functionality.		Say Y here to enable support for recovery functionality.

	@@ -124,7 +116,6 @@ config TOUCHSCREEN_SYNAPTICS_TCM_ZEROFLASH
	config TOUCHSCREEN_SYNAPTICS_TCM_DIAGNOSTICS		config TOUCHSCREEN_SYNAPTICS_TCM_DIAGNOSTICS
	tristate "Synaptics TCM diagnostics module"		tristate "Synaptics TCM diagnostics module"
	depends on TOUCHSCREEN_SYNAPTICS_TCM_CORE		depends on TOUCHSCREEN_SYNAPTICS_TCM_CORE
	default y
	help		help
	Say Y here to enable support for diagnostics functionality.		Say Y here to enable support for diagnostics functionality.

	@@ -132,4 +123,3 @@ config TOUCHSCREEN_SYNAPTICS_TCM_DIAGNOSTICS

	To compile this driver as a module, choose M here: the		To compile this driver as a module, choose M here: the
	module will be called synaptics_tcm_diagnostics.		module will be called synaptics_tcm_diagnostics.
	endif

drivers/input/touchscreen/synaptics_tcm/synaptics_tcm_core.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -528,6 +528,10 @@ int syna_tcm_bus_init(void);

	void syna_tcm_bus_exit(void);		void syna_tcm_bus_exit(void);

			int syna_tcm_bus_init_spi(void);

			void syna_tcm_bus_exit_spi(void);

	int syna_tcm_add_module(struct syna_tcm_module_cb *mod_cb, bool insert);		int syna_tcm_add_module(struct syna_tcm_module_cb *mod_cb, bool insert);

	static inline int syna_tcm_rmi_read(struct syna_tcm_hcd *tcm_hcd,		static inline int syna_tcm_rmi_read(struct syna_tcm_hcd *tcm_hcd,

drivers/input/touchscreen/synaptics_tcm/synaptics_tcm_i2c.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -53,7 +53,7 @@ struct drm_panel *tcm_get_panel(void)
	{		{
	return active_tcm_panel;		return active_tcm_panel;
	}		}
			EXPORT_SYMBOL(tcm_get_panel);

	#ifdef CONFIG_OF		#ifdef CONFIG_OF
	static int parse_dt(struct device dev, struct syna_tcm_board_data bdata)		static int parse_dt(struct device dev, struct syna_tcm_board_data bdata)