From patchwork Tue May 1 20:57:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 10374475 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 A89F2601C7 for ; Tue, 1 May 2018 20:57:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 97B3F28CD7 for ; Tue, 1 May 2018 20:57:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C53228CE3; Tue, 1 May 2018 20:57:21 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 78BBF28CD7 for ; Tue, 1 May 2018 20:57:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751095AbeEAU5S (ORCPT ); Tue, 1 May 2018 16:57:18 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:44373 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750911AbeEAU5R (ORCPT ); Tue, 1 May 2018 16:57:17 -0400 Received: by mail-pf0-f193.google.com with SMTP id q22so9906271pff.11; Tue, 01 May 2018 13:57:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=nb3je9mNOC0KMuJoDti8REv9zEMAVzEIv+0MpWFbdrs=; b=WK3HDTI2IfibLeADtvhDmVRXArVgOl7EZOpMoZSRj0rRA3FXwXlFM60NR0MOD8jkYn KKJ1DYGBHft0uqmwzW3daQvVOQMXFMNkD4l62zYi0DzAd4KD0cL8ej6dj5XgFPVqBWv7 KO49CZA4IPH56sl7g4hBqNNP6zTsGSzCILoPfu71DTiHrKhGHySnpxE64wLZzsfx11e5 L6GtOV+yfIAU38XKh338g1F9Cs9K4assbza1cqy8gMuEXJiBK9cQuAkBTl2M3MOGLjzu NEqIzLlMle8D15k+KD7SB0t2o3k2yUVx/Gj7yTXIDgB1xTjMGhAnwnggcbJHiWQ6oist bUmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=nb3je9mNOC0KMuJoDti8REv9zEMAVzEIv+0MpWFbdrs=; b=dCAGhfyf1kXSDZbS5rB6PNebmYmZ7f/3anEQCAgPaereZRnf3YhZdX2YJ1W4txq8Tr aLw79Xnnf6wl0CesK+Yal1V8QIuEoOb1g1wLGIwkj23hNLLfOMwZpmaDVnMU+tDTjpsQ vu/mLe6R6u+yIpX2OtlhNrubEy/YIjaazX12nYWSvHBdPGXgpZtnGEre5qRw9r7y5ziB IgBiZJfMAQZSRoWEtJ9aDEZaTSen+xXH33dNrzqAy/OPq8X8MMHvZ6d5ERczwgmj5Jdt JxvKJCSFvgUh+OoNIGq5dyXZ8v4oVUAGZo4ykuH0k5FA8W2ZmwgaNOezwlC+u32pSAWU lU7w== X-Gm-Message-State: ALQs6tCzluM1pY5xH92nUvYE8WDd+N+OftMrJFy4JllRFU4B6a/HbEMf HVQW+wuR9U5BHOuGNxaiBys= X-Google-Smtp-Source: AB8JxZoBGPvG+1XoQNbzuDmZYtffSeo6l5iRZNV1rR213MYAxN7/dgFuYBiXNbiUubwalpUvAnBCTw== X-Received: by 2002:a17:902:8345:: with SMTP id z5-v6mr17174754pln.311.1525208236988; Tue, 01 May 2018 13:57:16 -0700 (PDT) Received: from dtor-ws ([2620:0:1000:1511:8de6:27a8:ed13:2ef5]) by smtp.gmail.com with ESMTPSA id a12sm24848992pfe.78.2018.05.01.13.57.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 May 2018 13:57:15 -0700 (PDT) Date: Tue, 1 May 2018 13:57:13 -0700 From: Dmitry Torokhov To: Rob Herring Cc: Javier Martinez Canillas , "linux-kernel@vger.kernel.org" , devicetree@vger.kernel.org, Alexandre Belloni , linux-input@vger.kernel.org, Nicolas Ferre , Nick Dyer , Mark Rutland , "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" Subject: [PATCH v2] Input: atmel_mxt_ts - add missing compatible strings to OF device table Message-ID: <20180501205713.GA130399@dtor-ws> References: <20180410095340.24074-1-javierm@redhat.com> <20180501184853.GB52077@dtor-ws> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.2 (2017-12-15) 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 From: Javier Martinez Canillas 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 [dtor: document which compatibles are deprecated and should not be used] Signed-off-by: Dmitry Torokhov Reviewed-by: Rob Herring --- .../devicetree/bindings/input/atmel,maxtouch.txt | 7 +++++++ drivers/input/touchscreen/atmel_mxt_ts.c | 5 +++++ 2 files changed, 12 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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);