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

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

Merge "input: ft5x06_ts: remove proximity sensor support"

parents 1e7b2ab2 d0d1f783

Documentation/devicetree/bindings/input/touchscreen/ft5x06-ts.txt

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ Optional properties: 
				min y, max x and max y values

 - focaltech,fw-name	: specify the firmware file name

 - focaltech,psensor-support	: specify whether support the proximity sensor

 - focaltech,gesture-support	: specify whether support gesture feature



Example:

	i2c@f9923000{
@@ -106,5 +107,6 @@ Example: 
			focaltech,fw-delay-era-flsh-ms = <2000>;

			focaltech,fw-auto-cal;

			focaltech,psensor-support;

			focaltech,gesture-support;

		};

	};

drivers/input/touchscreen/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -1119,6 +1119,15 @@ config TOUCHSCREEN_FT5X06_PSENSOR 


         If unsure, say N.



config TOUCHSCREEN_FT5X06_GESTURE

       tristate "FocalTech gesture feature support"

       depends on TOUCHSCREEN_FT5X06

       help

         Say Y here if you want to support ft5x06's gesture

         feature.



         If unsure, say N.



config TOUCHSCREEN_MSTAR21XX

	tristate "Mstar touchscreens"

	depends on I2C

drivers/input/touchscreen/ft5x06_ts.c

+389 −247

File changed.

Preview size limit exceeded, changes collapsed.

include/linux/input/ft5x06_ts.h

+6 −6

File changed.

Preview size limit exceeded, changes collapsed.