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

Commit b91d6eb9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "input: touchscreen: Correct return value check in Goodix driver"

parents 1401e6dd 0852e7e7

Documentation/devicetree/bindings/input/touchscreen/gt9xx/gt9xx.txt

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ Required properties: 
 - interrupt-parent	: Parent of interrupt.

 - interrupts		: Configuration of touch panel controller interrupt

				GPIO.

 - goodix,family-id	: Family identification of the controller.

 - goodix,product-id	: Product identification of the controller.

 - interrupt-gpios	: Interrupt gpio which is to provide interrupts to

				host, same as "interrupts" node.

 - reset-gpios		: Reset gpio to control the reset of chip.
@@ -49,7 +49,7 @@ i2c@f9927000 { 
			goodix,panel-coords = <0 0 720 1200>;

			goodix,display-coords = <0 0 720 1080>;

			goodix,button-map= <158 102 139>;

			goodix,family-id = <0x0>;

			goodix,product-id = "915";

			goodix,cfg-data = [

		41 D0 02 00 05 0A 05 01 01 08

		12 58 50 41 03 05 00 00 00 00

drivers/input/touchscreen/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -1075,4 +1075,15 @@ config TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE 
	  To compile this driver as a module, choose M here: the

	  module will be called synaptics_dsx_fw_update.



config TOUCHSCREEN_GT9XX

	bool "Goodix touchpanel GT9xx series"

	depends on I2C

	help

	  Say Y here if you have a Goodix GT9xx touchscreen.

	  Gt9xx controllers are multi touch controllers which can

	  report 5 touches at a time.



          If unsure, say N.



source "drivers/input/touchscreen/gt9xx/Kconfig"

endif

drivers/input/touchscreen/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -87,3 +87,4 @@ obj-$(CONFIG_TOUCHSCREEN_MSTAR21XX) += msg21xx_ts.o 
obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)		+= synaptics_i2c_rmi4.o

obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI4_DEV)	+= synaptics_rmi_dev.o

obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE) 	+= synaptics_fw_update.o

obj-$(CONFIG_TOUCHSCREEN_GT9XX)		+= gt9xx/

drivers/input/touchscreen/gt9xx/Kconfig

0 → 100644
+51 −0
Original line number Diff line number Diff line 
#

# Goodix GT9xx Touchscreen driver

#



config GT9XX_TOUCHPANEL_DRIVER

	tristate "Goodix GT9xx touchpanel driver"

	depends on TOUCHSCREEN_GT9XX

	default n

	help

	  This is the main file for touchpanel driver for Goodix GT9xx

	  touchscreens.



	  Say Y here if you have a Goodix GT9xx touchscreen connected

	  to your system.



	  If unsure, say N.



	  To compile this driver as a module, choose M here: the

	  module will be called gt9xx.



config GT9XX_TOUCHPANEL_UPDATE

	tristate "Goodix GT9xx touchpanel auto update support"

	depends on GT9XX_TOUCHPANEL_DRIVER

	default n

	help

	  This enables support for firmware update for Goodix GT9xx

	  touchscreens.



	  Say Y here if you have a Goodix GT9xx touchscreen connected

	  to your system.



	  If unsure, say N.



	  To compile this driver as a module, choose M here: the

	  module will be called gt9xx_update.



config GT9XX_TOUCHPANEL_DEBUG

	tristate "Goodix GT9xx Tools for debuging"

	depends on GT9XX_TOUCHPANEL_DRIVER

	default n

	help

	  This is application debug interface support for Goodix GT9xx

	  touchscreens.



	  Say Y here if you want to have a Android app debug interface

	  to your system.



	  If unsure, say N.



	  To compile this driver as a module, choose M here: the

	  module will be called gt9xx_tool.

drivers/input/touchscreen/gt9xx/Makefile

0 → 100644
+8 −0
Original line number Diff line number Diff line 
#gt915 touchpanel driver





obj-$(CONFIG_GT9XX_TOUCHPANEL_DRIVER)	+= gt9xx.o

#gt915 update file

obj-$(CONFIG_GT9XX_TOUCHPANEL_UPDATE)	+= gt9xx_update.o

#debug tool

obj-$(CONFIG_GT9XX_TOUCHPANEL_DEBUG)	+= goodix_tool.o