]> git.baikalelectronics.ru Git - kernel.git/commit
Input: remove duplicate ft6236 driver
authorHans de Goede <hdegoede@redhat.com>
Thu, 4 Aug 2016 15:21:19 +0000 (08:21 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 22 Aug 2016 21:16:07 +0000 (14:16 -0700)
commit6bb741e233e779a55a84d77f3c2dd2abedaa869a
tree4ca30875c97394b9ef20dd8714cdcc53eab9ca46
parenta64a48633279f5e6b12e1fcabf73afb035dbb2d1
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>
Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.txt
Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt [deleted file]
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/input/touchscreen/edt-ft5x06.c
drivers/input/touchscreen/ft6236.c [deleted file]