diff options
| author | Hans de Goede | 2016-08-04 17:21:19 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2016-08-22 23:16:07 +0200 |
| commit | d18716542d137beafef2859bdf90d4e0c9a25523 (patch) | |
| tree | 4ca30875c97394b9ef20dd8714cdcc53eab9ca46 /drivers/input/touchscreen/Makefile | |
| parent | Input: add driver for SiS 9200 family I2C touchscreen controllers (diff) | |
| download | kernel-qcow2-linux-d18716542d137beafef2859bdf90d4e0c9a25523.tar.gz kernel-qcow2-linux-d18716542d137beafef2859bdf90d4e0c9a25523.tar.xz kernel-qcow2-linux-d18716542d137beafef2859bdf90d4e0c9a25523.zip | |
Input: remove duplicate ft6236 driver
The new(ish) ft6236 simply re-implements the M09 protocol of the
(much) older edt-ft5x06.c driver.
This commit removes this duplicate driver and adds the i2c ids and
dt compatible string to the edt-ft5x06.c driver to keep compatibility.
This commit also adds the standard touchscreen properties as optional
properties to the edt,ft5x06 binding, these were documented in the
focaltech,ft6236 bindingi, but were missing from the edt,ft5x06 doc.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/touchscreen/Makefile')
| -rw-r--r-- | drivers/input/touchscreen/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index b4373d6be402..57a1c099bc0d 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -36,7 +36,6 @@ obj-$(CONFIG_TOUCHSCREEN_ELAN) += elants_i2c.o obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o obj-$(CONFIG_TOUCHSCREEN_EGALAX) += egalax_ts.o obj-$(CONFIG_TOUCHSCREEN_EGALAX_SERIAL) += egalax_ts_serial.o -obj-$(CONFIG_TOUCHSCREEN_FT6236) += ft6236.o obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o obj-$(CONFIG_TOUCHSCREEN_GOODIX) += goodix.o obj-$(CONFIG_TOUCHSCREEN_ILI210X) += ili210x.o |