diff mbox

[v2] Input: atmel_mxt_ts - add missing compatible strings to OF device table

Message ID 20180501205713.GA130399@dtor-ws (mailing list archive)
State New, archived
Headers show

Commit Message

Dmitry Torokhov May 1, 2018, 8:57 p.m. UTC
From: Javier Martinez Canillas <javierm@redhat.com>

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>
[dtor: document which compatibles are deprecated and should not be used]
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 .../devicetree/bindings/input/atmel,maxtouch.txt   |    7 +++++++
 drivers/input/touchscreen/atmel_mxt_ts.c           |    5 +++++
 2 files changed, 12 insertions(+)

Comments

Rob Herring May 1, 2018, 9:33 p.m. UTC | #1
On Tue, May 1, 2018 at 3:57 PM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
> From: Javier Martinez Canillas <javierm@redhat.com>
>
> 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>
> [dtor: document which compatibles are deprecated and should not be used]
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
>  .../devicetree/bindings/input/atmel,maxtouch.txt   |    7 +++++++
>  drivers/input/touchscreen/atmel_mxt_ts.c           |    5 +++++
>  2 files changed, 12 insertions(+)

Reviewed-by: Rob Herring <robh@kernel.org>

Someone is going to make the dts updates, right?
Dmitry Torokhov May 1, 2018, 10:49 p.m. UTC | #2
On Tue, May 01, 2018 at 04:33:07PM -0500, Rob Herring wrote:
> On Tue, May 1, 2018 at 3:57 PM, Dmitry Torokhov
> <dmitry.torokhov@gmail.com> wrote:
> > From: Javier Martinez Canillas <javierm@redhat.com>
> >
> > 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>
> > [dtor: document which compatibles are deprecated and should not be used]
> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> > ---
> >  .../devicetree/bindings/input/atmel,maxtouch.txt   |    7 +++++++
> >  drivers/input/touchscreen/atmel_mxt_ts.c           |    5 +++++
> >  2 files changed, 12 insertions(+)
> 
> Reviewed-by: Rob Herring <robh@kernel.org>
> 
> Someone is going to make the dts updates, right?

I sent out 2 patches...
Javier Martinez Canillas May 2, 2018, 6:36 p.m. UTC | #3
Hi Dmitry,

On 05/01/2018 10:57 PM, Dmitry Torokhov wrote:
> From: Javier Martinez Canillas <javierm@redhat.com>
> 
> 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>
> [dtor: document which compatibles are deprecated and should not be used]
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Thanks for taking care of this. Yes, I should had added as deprecated indeed.

Best regards,
Javier
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
index 23e3abc3fdef0..c88919480d373 100644
--- a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
+++ b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
@@ -4,6 +4,13 @@  Required properties:
 - compatible:
     atmel,maxtouch
 
+    The following compatibles have been used in various products but are
+    deprecated:
+	atmel,qt602240_ts
+	atmel,atmel_mxt_ts
+	atmel,atmel_mxt_tp
+	atmel,mXT224
+
 - reg: The I2C address of the device
 
 - 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 5f41c1860f403..779dbfcc0eded 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -3297,6 +3297,11 @@  static SIMPLE_DEV_PM_OPS(mxt_pm_ops, mxt_suspend, mxt_resume);
 
 static const struct of_device_id mxt_of_match[] = {
 	{ .compatible = "atmel,maxtouch", },
+	/* Compatibles listed below are deprecated */
+	{ .compatible = "atmel,qt602240_ts", },
+	{ .compatible = "atmel,atmel_mxt_ts", },
+	{ .compatible = "atmel,atmel_mxt_tp", },
+	{ .compatible = "atmel,mXT224", },
 	{},
 };
 MODULE_DEVICE_TABLE(of, mxt_of_match);