From patchwork Tue Apr 10 09:53:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 10332769 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 680686053C for ; Tue, 10 Apr 2018 09:54:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5849128831 for ; Tue, 10 Apr 2018 09:54:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4CBCC28D55; Tue, 10 Apr 2018 09:54:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59FBF28831 for ; Tue, 10 Apr 2018 09:54:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752491AbeDJJx7 (ORCPT ); Tue, 10 Apr 2018 05:53:59 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:45033 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752453AbeDJJx6 (ORCPT ); Tue, 10 Apr 2018 05:53:58 -0400 Received: by mail-pl0-f65.google.com with SMTP id b6-v6so7134676pla.11 for ; Tue, 10 Apr 2018 02:53:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=kOo1OXL8VNFRO2NYVZAIKi3hWDNJYdu1x/x8X2BZ7QU=; b=BIaX0prXlWrirsYOuC2Q3ZcR1fynyeobjV9MNDypq2SA5bFECed5dDskMDiby0+vLB MjQD/iBkgCamZorPdCx7s5pjWEP3/+/8+Le1gOBEvzQ7clbtuB5MqxOXk0xPmBMsrPWw cEwtge/aenmXr9vaN/JzFbl3Ua4dhQ+oeFu1wg3n+7K/eNbnsVjPDWA9/S1vJTzuSZ49 MIIiIvUd22Cqu/t84kPEKIxMUU9U0IGpFdiLzP432jpQyEz5v1GvpVxYhve5bKqBQ9v2 lMK5Dyu6Bu7Bd8ujVhIfKQclbgve0+8ZKfkmKlFWTOhfU7WG656YOvmb8rQGOS4TpewK jKxA== X-Gm-Message-State: AElRT7FbMeENnjA92qS/TAoGpab0KjgbywLSK1LfepUxS3uCAzgUipju 8To0i8dDSpSpVVlTMs4MEmZIxw== X-Google-Smtp-Source: AIpwx49UVxA1/a9kyGUPUlFopD2k9ki28MyZps8XTcxFaFVHhmZD5avB8fL26PwS27N8rVTTsETzBA== X-Received: by 2002:a17:902:158b:: with SMTP id m11-v6mr42505921pla.300.1523354037517; Tue, 10 Apr 2018 02:53:57 -0700 (PDT) Received: from minerva.redhat.com ([90.77.100.34]) by smtp.gmail.com with ESMTPSA id c66sm5007111pfc.56.2018.04.10.02.53.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Apr 2018 02:53:56 -0700 (PDT) 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-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Tested-by: Enric Balletbo i Serra Reviewed-by: Rob Herring --- 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);