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: 10332775 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 B1AAB60365 for ; Tue, 10 Apr 2018 10:00:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A04AE28C74 for ; Tue, 10 Apr 2018 10:00:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9513F28D4E; Tue, 10 Apr 2018 10:00:53 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4FBB128C74 for ; Tue, 10 Apr 2018 10:00:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=+Fjq8oJ7J+R3sJP64JEN/CaZptpAu32hWGg9WDB7AuA=; b=hLh Mqto3n8bJWcpHsRiFPXyERrea49e+6JIJFjSS2MNnRl3j6XSaH/CWPWinPzDuuWnyVCidoa/7zFAk LYF4/W5ZHaRlplcjp1kRmGdebR9jUJJJkwu/DfunvCijtXswrrtsbJAzcC4KvuA6I5InnkTwparBG 7jPuZUNdgtz9hgm6fw/w0wiRP8FACOiUoM7yHmvrBG5VYll5ytmGbC+da2Ebe5vZHNnFVT1w2edVm jln/7MODrNezSKreJ7nw/X5KQmr/gh5Oq0RnYkgw7tLOxFCx+pAsH0u5hB+5drG8cjb2s7rfRHHJy T0+ltL5vWujtV0ghDBLfhJrK55YsoAw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f5q4z-0001Vh-7I; Tue, 10 Apr 2018 10:00:45 +0000 Received: from mail-pl0-f66.google.com ([209.85.160.66]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f5q4s-0001UJ-6b for linux-arm-kernel@lists.infradead.org; Tue, 10 Apr 2018 10:00:42 +0000 Received: by mail-pl0-f66.google.com with SMTP id x4-v6so7159563pln.7 for ; Tue, 10 Apr 2018 03:00:27 -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=FHdeZYF/lkY1TpnfsvbGOdClCvClVfKXPgqp4CA+gAQNryInTKdKU/kZ1zgfBWXqe9 ZHMRgF8KGcTARdsM1YUxiAiEXv3AC4k36vCpgXwiotdP+dA76hiXffHuwP9gTrIqwZ8E +hmcBB9kvDB7bxoy6xrEtIcI0/LqxHA9IibBbQq4S7td1fvvTHP0Ak4tCX1tzs56BDvU n6j2fXieNMMXxYFMpdxTtmUpHxUy4n/lR+0PUf00lNlABQjJO82J/gpyOhQjBLH6n+2p hADlioGbnR84ct80Yff8B8nx6sHyTF5a6bybEr0B6GJHcfHIiAaePvpeclOc/0ShaiEn mZ5w== X-Gm-Message-State: AElRT7HreNP+6G/6uD1xXx76lStFNF8BiLKZjOu6MrR3rg6bNX8nINWv wNGg9UQc0Z788PhM3GylrDcdQw== 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180410_030038_241539_07957A94 X-CRM114-Status: GOOD ( 15.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Alexandre Belloni , Nick Dyer , Dmitry Torokhov , Javier Martinez Canillas , Rob Herring , linux-input@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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);