Merge remote-tracking branch 'xen-tip/linux-next'

[deliverable/linux.git] / drivers / input / touchscreen / edt-ft5x06.c

diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index 703e295a37ed1d6285e4595fed78185e184ac6bd..28466e358fee1dc6399ea8693dfd7e909fd29870 100644 (file)
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -1063,9 +1063,15 @@ static const struct edt_i2c_chip_data edt_ft5506_data = {
        .max_support_points = 10,
 };
 
+static const struct edt_i2c_chip_data edt_ft6236_data = {
+       .max_support_points = 2,
+};
+
 static const struct i2c_device_id edt_ft5x06_ts_id[] = {
        { .name = "edt-ft5x06", .driver_data = (long)&edt_ft5x06_data },
        { .name = "edt-ft5506", .driver_data = (long)&edt_ft5506_data },
+       /* Note no edt- prefix for compatibility with the ft6236.c driver */
+       { .name = "ft6236", .driver_data = (long)&edt_ft6236_data },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(i2c, edt_ft5x06_ts_id);
@@ -1076,6 +1082,8 @@ static const struct of_device_id edt_ft5x06_of_match[] = {
        { .compatible = "edt,edt-ft5306", .data = &edt_ft5x06_data },
        { .compatible = "edt,edt-ft5406", .data = &edt_ft5x06_data },
        { .compatible = "edt,edt-ft5506", .data = &edt_ft5506_data },
+       /* Note focaltech vendor prefix for compatibility with ft6236.c */
+       { .compatible = "focaltech,ft6236", .data = &edt_ft6236_data },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, edt_ft5x06_of_match);