aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javierm@redhat.com>2018-05-01 14:44:53 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2018-05-01 18:51:15 -0400
commitf6eeb9e548572c0e64632672dbd04363cbdd4eed (patch)
tree44aa316a320a29c0c7fa76119b9400607171f9df
parent068bdb67ef74df0ad1627b7247a163e3e252ac11 (diff)
Input: atmel_mxt_ts - add missing compatible strings to OF device table
Commit af503716ac14 ("i2c: core: report OF style module alias for devices registered via OF") fixed how the I2C core reports the module alias when devices are registered via OF. But the atmel_mxt_ts driver only has an "atmel,maxtouch" compatible in its OF device ID table, so if a Device Tree is using a different one, autoload won't be working for the module (the matching works because the I2C device ID table is used as a fallback). So add compatible strings for each of the entries in the I2C device table. Fixes: af503716ac14 ("i2c: core: report OF style module alias for devices registered via OF") Reported-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Tested-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Reviewed-by: Rob Herring <robh@kernel.org> [dtor: document which compatibles are deprecated and should not be used] Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--Documentation/devicetree/bindings/input/atmel,maxtouch.txt7
-rw-r--r--drivers/input/touchscreen/atmel_mxt_ts.c5
2 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
index 23e3abc3fdef..c88919480d37 100644
--- a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
+++ b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
@@ -4,6 +4,13 @@ Required properties:
4- compatible: 4- compatible:
5 atmel,maxtouch 5 atmel,maxtouch
6 6
7 The following compatibles have been used in various products but are
8 deprecated:
9 atmel,qt602240_ts
10 atmel,atmel_mxt_ts
11 atmel,atmel_mxt_tp
12 atmel,mXT224
13
7- reg: The I2C address of the device 14- reg: The I2C address of the device
8 15
9- interrupts: The sink for the touchpad's IRQ output 16- interrupts: The sink for the touchpad's IRQ output
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index fc149ea64be7..f04e4fbf39c1 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -3282,6 +3282,11 @@ static SIMPLE_DEV_PM_OPS(mxt_pm_ops, mxt_suspend, mxt_resume);
3282 3282
3283static const struct of_device_id mxt_of_match[] = { 3283static const struct of_device_id mxt_of_match[] = {
3284 { .compatible = "atmel,maxtouch", }, 3284 { .compatible = "atmel,maxtouch", },
3285 /* Compatibles listed below are deprecated */
3286 { .compatible = "atmel,qt602240_ts", },
3287 { .compatible = "atmel,atmel_mxt_ts", },
3288 { .compatible = "atmel,atmel_mxt_tp", },
3289 { .compatible = "atmel,mXT224", },
3285 {}, 3290 {},
3286}; 3291};
3287MODULE_DEVICE_TABLE(of, mxt_of_match); 3292MODULE_DEVICE_TABLE(of, mxt_of_match);