From patchwork Mon Apr 15 16:11:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffrey Hugo X-Patchwork-Id: 10901159 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C6A6F13B5 for ; Mon, 15 Apr 2019 16:11:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE5A928845 for ; Mon, 15 Apr 2019 16:11:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A239028866; Mon, 15 Apr 2019 16:11:18 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 5457D28845 for ; Mon, 15 Apr 2019 16:11:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727851AbfDOQLN (ORCPT ); Mon, 15 Apr 2019 12:11:13 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:46339 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727834AbfDOQLM (ORCPT ); Mon, 15 Apr 2019 12:11:12 -0400 Received: by mail-pl1-f195.google.com with SMTP id y6so8778809pll.13; Mon, 15 Apr 2019 09:11:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tZb0G+Ixk05sPWFLkG4KLNrtvUAjvxl/N0UbSKoYsGA=; b=o1rxf+p6yrXr83RO7GSPmI34elIz+dcIq2aH+q1Z3qWW61lDb+BWTvAp/TZQTpSqpS SCoELej5EsuqYHi+0WG3Qi/NcsF91qCIa0PDANVVkRY7kNENIdXi2TeiJp5wd4XyIvTH MSQFz0divmh0gMtnuZHJgAg9BttUEJV1ZaugsSca10KPFDQi9Fd0V/vfSIkvKR8uRIs9 sG+e1KE/rTWrjik2Pz89KB0XVi9w3J17tDm+LsXWVaiIxrCswmt4Y63kUBmOlMv8Zsq0 ahJ5PC47bRd/W3i3Z2s/e57noLpnyR1+CkM4yR1r90PMH1+jd9N7oQXHqyEzupOf/Rqt BgCQ== 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:in-reply-to :references; bh=tZb0G+Ixk05sPWFLkG4KLNrtvUAjvxl/N0UbSKoYsGA=; b=FJ47PIFLVXK+E1uQ5M7qoGJYwZe/pWRrMF+HX8b9v4aLctVrtaK88PAEnSzSOlrZow ENTwTjiddTt62mTdpl4z24M7e3M7+cnf8VzwpgIlBp+bD4x/8+JgwmwZKvhmOqq2v/qT oqlOCoZeY1DdFXJ/3hWqEC+pk1NwF2egnmSyf5Kygt9430objjVHqMnVVfnSN/EMDKfw 3LEIlE31L7a82hwixfPV96rWsio2kMv3sMHJ5rhK1LnZJAzfJf0o0QjhAjAMlOq8B1Tw yjYOh/hT/B2S7lz6N6HPlc8Z5mAtSIiPrPq0lTjPep787/KMZS4WG0KSsF7Kttf95H6R PDAw== X-Gm-Message-State: APjAAAVP4JMSqI9NPfjbLpNnC47SqnSSZ9xDGlwze/GTw/scGpUlpfX3 E1C3q1IirPjxicKKfOpmZoM= X-Google-Smtp-Source: APXvYqzctdkN23u9O7ytCx/3VZFsxswOcLlHD97OHr6g+V7u1F26SYyneIte8ailWmWDG73D96N7XQ== X-Received: by 2002:a17:902:8b8c:: with SMTP id ay12mr27140656plb.192.1555344672098; Mon, 15 Apr 2019 09:11:12 -0700 (PDT) Received: from aw-bldr-10.qualcomm.com (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id 75sm98591590pfr.55.2019.04.15.09.11.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 09:11:11 -0700 (PDT) From: Jeffrey Hugo To: robh+dt@kernel.org, mark.rutland@arm.com, jikos@kernel.org, benjamin.tissoires@redhat.com Cc: lee.jones@linaro.org, bjorn.andersson@linaro.org, dmitry.torokhov@gmail.com, agross@kernel.org, david.brown@linaro.org, linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Jeffrey Hugo Subject: [PATCH v3 2/3] HID: quirks: Fix keyboard + touchpad on Lenovo Miix 630 for DT Date: Mon, 15 Apr 2019 09:11:08 -0700 Message-Id: <20190415161108.16419-1-jeffrey.l.hugo@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190415160915.16324-1-jeffrey.l.hugo@gmail.com> References: <20190415160915.16324-1-jeffrey.l.hugo@gmail.com> 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 Following up on commit 2bafa1e96254 ("HID: quirks: Fix keyboard + touchpad on Lenovo Miix 630"), the devicetree (DT) identifier for the combo keyboard + touchpad device is "elan,combo400-i2c", which differs from the ACPI ID, thus if we want the quirk to work properly when booting via DT instead of ACPI, we need to key off the DT id as well. Signed-off-by: Jeffrey Hugo --- drivers/hid/hid-quirks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c index 77ffba48cc73..00c08f8318b8 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -997,7 +997,8 @@ bool hid_ignore(struct hid_device *hdev) return true; /* Same with product id 0x0400 */ if (hdev->product == 0x0400 && - strncmp(hdev->name, "QTEC0001", 8) != 0) + (strncmp(hdev->name, "QTEC0001", 8) != 0 || + strncmp(hdev->name, "elan,combo400-i2c", 17) != 0)) return true; break; }