From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752690AbeDJJyA (ORCPT ); Tue, 10 Apr 2018 05:54:00 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:38893 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752487AbeDJJx6 (ORCPT ); Tue, 10 Apr 2018 05:53:58 -0400 X-Google-Smtp-Source: AIpwx49UVxA1/a9kyGUPUlFopD2k9ki28MyZps8XTcxFaFVHhmZD5avB8fL26PwS27N8rVTTsETzBA== From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Javier Martinez Canillas , devicetree@vger.kernel.org, Alexandre Belloni , Rob Herring , Dmitry Torokhov , linux-input@vger.kernel.org, Nicolas Ferre , Nick Dyer , Mark Rutland , linux-arm-kernel@lists.infradead.org Subject: [PATCH] Input: atmel_mxt_ts - add missing compatible strings to OF device table Date: Tue, 10 Apr 2018 11:53:40 +0200 Message-Id: <20180410095340.24074-1-javierm@redhat.com> X-Mailer: git-send-email 2.14.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Javier Martinez Canillas --- Documentation/devicetree/bindings/input/atmel,maxtouch.txt | 6 +++++- drivers/input/touchscreen/atmel_mxt_ts.c | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt index 23e3abc3fdef..cd43fb8bc2ce 100644 --- a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt +++ b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt @@ -1,8 +1,12 @@ Atmel maXTouch touchscreen/touchpad Required properties: -- compatible: +- compatible: Must be one of the following + atmel,qt602240_ts + atmel,atmel_mxt_ts + atmel,atmel_mxt_tp atmel,maxtouch + atmel,mXT224 - reg: The I2C address of the device diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 7659bc48f1db..e8ef83f168d6 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -3238,7 +3238,11 @@ static int __maybe_unused mxt_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(mxt_pm_ops, mxt_suspend, mxt_resume); static const struct of_device_id mxt_of_match[] = { + { .compatible = "atmel,qt602240_ts", }, + { .compatible = "atmel,atmel_mxt_ts", }, + { .compatible = "atmel,atmel_mxt_tp", }, { .compatible = "atmel,maxtouch", }, + { .compatible = "atmel,mXT224", }, {}, }; MODULE_DEVICE_TABLE(of, mxt_of_match); -- 2.14.3