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: 10374479 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 F40E160234 for ; Tue, 1 May 2018 20:57:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8F6A28CD9 for ; Tue, 1 May 2018 20:57:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB3B328CD7; Tue, 1 May 2018 20:57:39 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, 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 6957428CD7 for ; Tue, 1 May 2018 20:57:39 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1r+9YXI3U7T7bYjrjryXlrd4g5yalz7CQQEFqY8Myu8=; b=YtzEPF7188B96g Ssyj7hoyRtQa/05QF7jE1sB2+C1tof23jjv2/3JTXXAhkB2sA+pjEGOfbna5nll5hdZRnWP4zxq4u R6AfZC1oOu/c2M3OxfR34yFu9L0nJNdjhGY0QbwUGgYBa6EAsE5BrPR3tmFiY65NRGz+tFQxg3xND zXnH3kloe19XuWBvtqnUVM8CWQGkUAi4JsILETBC3zPu06o0PjvVe4YP5etTuvVhO0u2rETpqWN9K r1dVygIBKKQ3M6Y569H1EEuiFDd2hKZ9CcCEEDwUeEYuCZ8inqes/K1FsYMyxCRl3PNWXMBxYYwe3 KPiqJfGIv7FcRCH66TIQ==; 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 1fDcL5-0000lm-9S; Tue, 01 May 2018 20:57:31 +0000 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fDcL1-0000kE-Vs for linux-arm-kernel@lists.infradead.org; Tue, 01 May 2018 20:57:29 +0000 Received: by mail-pf0-x244.google.com with SMTP id f20so1123733pfn.0 for ; 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=CmajYFQ+aOeZgvAtml1weV858Jqz0CEUqUxhWozr8FLoXdEMFsn2TpKpn+kOWc1Bk/ ECNTDAdaNlarnZZMBW3jPReQahkDlks0RwXu4Nt5JU51tp+bmyYYrYh2Mf204sY6azNA hkUqI6UYfFN/TNdcLA/7BkW2TTWnTfv3pSeI20SXvYoSsYq0trjlsKget68WzLtSYP7d YfVD62yNDxS3LKSul+j+QCuKR7nKFjXg/SmWyovb7Z6yBoTubthHKYoXYXwNW+CwTrSS 4iqyZAJEGibFqOwFMqK+Lu2WQ+7Dk72pSstVbqe5syNsHjiRZHvuDMEH0IDIbpkZ0ed2 9dnQ== X-Gm-Message-State: ALQs6tBultu+OPZyI/OZn/3GGk/whs2v6u81ni4rQ+9tybg+S7++RNAp mCzy8eJV85QDjzBFCOdd/OQ= 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 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) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180501_135728_027414_97086D4B X-CRM114-Status: GOOD ( 14.78 ) 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 , "linux-kernel@vger.kernel.org" , Javier Martinez Canillas , linux-input@vger.kernel.org, "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" 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 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(+) 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);