From patchwork Mon Apr 15 16:10:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffrey Hugo X-Patchwork-Id: 10901155 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 17A001800 for ; Mon, 15 Apr 2019 16:11:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3E75285D2 for ; Mon, 15 Apr 2019 16:11:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7ADC28866; Mon, 15 Apr 2019 16:11:01 +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 95C5128864 for ; Mon, 15 Apr 2019 16:11:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727746AbfDOQLA (ORCPT ); Mon, 15 Apr 2019 12:11:00 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:35751 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726034AbfDOQLA (ORCPT ); Mon, 15 Apr 2019 12:11:00 -0400 Received: by mail-pl1-f196.google.com with SMTP id w24so8802161plp.2; Mon, 15 Apr 2019 09:11:00 -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=DQ8H7Nhhsa18x4UZUWx42/gvziYn/UG3Ch12n2tKxG0=; b=WGsacBF1wdCB5D92cf/Vaa4BqbPhPlkJTP73aNTEMoT1nYXi3hWmXXoXmroXI3qDiz 3P/RUidInyHur02lsn+MihDH/C0lJrQZyAc6LRJ7+wdekepzBCrqA2kauZykILODq7Ut v2e0mJfZLrq6f2FJZEuQQkF1TZEyVSvQ36mXtHKCPrfZ7sBcfaakZF0FeatTgPvYrbr5 zZlC1NYVW7OoSrF0qjDFmKr+5ehwp2ifbvOwnw1PiVdqo9MFYyFe2OhvzynyYjzrMXL6 wqwnQrKf7l52QF/LdswVb2hqP/srSrqltTIjUjwx7Xere121j+/gBkcr3yrwdJ1b/H40 7Rew== 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=DQ8H7Nhhsa18x4UZUWx42/gvziYn/UG3Ch12n2tKxG0=; b=oq9b6I8ZaM9U8BK8LXZoC1qVZf5/5tb/NSPcUTfvUceoDEpjFn13AWELf8lu/KclFp FesH6+bNt8altlEr2XDplL8q5RE/t3LXa6yGWFQqIn9LKyrAzUo3K3qSi6jHo68mq1mo kn+Tccnv9ZU2qVi3LUZS0fnh/0tUvzg2x0bxT5XrVCsmrTAXFgc2BQrDf87+Od5reiOw xVT85xQk5zCmRX+P5mh8JZ2RmyXwQYY887bAvFCsTX81aGfteH7ev4IiKfPdS4ygtjwM QRj6rgYYQpAhA708eqG7xs3/xqCpR8TQ+4zWbOblEAG3yNRbPqSrBZUPhtDX18ljxxXZ Cxbg== X-Gm-Message-State: APjAAAVlcOJ83g0pzKEPbXc37m7wnPjDnpNYu9aNfh/rf0C5m1011PKu qNFWIu0KJhw+Yd7NcvhvFa8= X-Google-Smtp-Source: APXvYqwnhJHcgGMYYOaRxUu66dyzoT5hXcMSDiZ2t1c4VG2WfddCVt+tjSzoVGjbuchp9jWhq4DlBw== X-Received: by 2002:a17:902:4643:: with SMTP id o61mr65742800pld.249.1555344659824; Mon, 15 Apr 2019 09:10:59 -0700 (PDT) Received: from aw-bldr-10.qualcomm.com (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id b72sm92794489pga.86.2019.04.15.09.10.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 09:10:59 -0700 (PDT) From: Jeffrey Hugo To: robh+dt@kernel.org, mark.rutland@arm.com Cc: lee.jones@linaro.org, bjorn.andersson@linaro.org, dmitry.torokhov@gmail.com, agross@kernel.org, david.brown@linaro.org, jikos@kernel.org, benjamin.tissoires@redhat.com, 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 1/3] dt-bindings: input: add Elan 400 combo keyboard/touchpad over i2c Date: Mon, 15 Apr 2019 09:10:55 -0700 Message-Id: <20190415161055.16372-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 The Elan 400 combo keyboard/touchpad over i2c device is a distinct device from the Elan 400 standalone touchpad device. The combo device has been found in the Lenovo Miix 630 and HP Envy x2 laptops. Signed-off-by: Jeffrey Hugo --- .../devicetree/bindings/input/elan,combo400-i2c.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/elan,combo400-i2c.txt diff --git a/Documentation/devicetree/bindings/input/elan,combo400-i2c.txt b/Documentation/devicetree/bindings/input/elan,combo400-i2c.txt new file mode 100644 index 000000000000..fb700a29148d --- /dev/null +++ b/Documentation/devicetree/bindings/input/elan,combo400-i2c.txt @@ -0,0 +1,11 @@ +Elantech 0400 I2C combination Keyboard/Touchpad + +This binding describes an Elan device with pid 0x0400, that is a combination +keyboard + touchpad device. This binding does not cover an Elan device with +pid 0x0400 that is solely a standalone touchpad device. + +Required properties: +- compatible: should be "elan,combo400-i2c" + +This binding is compatible with the HID over I2C binding, which is specified +in hid-over-i2c.txt in this directory. 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; } From patchwork Mon Apr 15 16:11:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffrey Hugo X-Patchwork-Id: 10901165 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 773D113B5 for ; Mon, 15 Apr 2019 16:11:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 639ED28845 for ; Mon, 15 Apr 2019 16:11:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57E0728866; Mon, 15 Apr 2019 16:11:30 +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=unavailable 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 A21C828845 for ; Mon, 15 Apr 2019 16:11:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727834AbfDOQLX (ORCPT ); Mon, 15 Apr 2019 12:11:23 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:44103 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727728AbfDOQLW (ORCPT ); Mon, 15 Apr 2019 12:11:22 -0400 Received: by mail-pf1-f194.google.com with SMTP id y13so8815289pfm.11; Mon, 15 Apr 2019 09:11:21 -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=m++RKu496JnoElqniMzOlaZsj1WxleZDLLBN45m4GqU=; b=ODuJhSwrTEE9dnaKyM7sWaTlmXVDFRDwxLTOafQ70oc/7suXoKf85smy0D1O/pO0e2 4LxmkJrvDaYVBj8cS/WODsi09DoznHVNA46gJ9+3ZfxjiAR72G8ri9TcjCeax17FcpvW dyJCPnFo8oL5eE3xrEJ7p0MFOddPkVyjGbvxPbHEk7dpTSoK9GIFCnbxJ8yP9yyuR6ug /4YqO2/J8muEbw2YK9/fDT9yQktarLZklqjvIRbQmlehRd5lXVE9tmMH3RsFbbRP0Osr urgL41BbtDkfAXv58gNYVBMx20RGqjG7ONRGdvLNn8I+CZu29uNPSXi0JRLV23e66Mmx mJWw== 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=m++RKu496JnoElqniMzOlaZsj1WxleZDLLBN45m4GqU=; b=bjsdw+lZP1vzqIQC1dC4kjuPW74C4gc5DyZYPnG+1jno5AM6hzhL8XyusYXwj6XKFW eSZetXPjil1N0ouS/tMmMfhj0fTrasalQmrqJiXlRKxsUYdGP5AEG/GSm/kARlqZ3NnQ ip0R27e/+83bsHkls5knsVMJgUJN/OEtcCSNmfxo2p3AiZ7u7rZOVneDOYxj6hDktgGv 0/owdsi33D63r6EWohzzKfBZNS8WmkyvXhv6kXOT0OIlKx8PFZIEULayspe7tACzeVVq Phdc0Y6qS1JKvdWrL1Kyia8Qrir8J2CsX4P+6MDtbgIPdM1rK31lv+9iQYm23b2XdDNY tNtw== X-Gm-Message-State: APjAAAXZMC3zGDatjw5/3/cHSou1YV8mgCkOeGq40EjA15lIUK3iZg7Y OaptWMYyAaop5YXrYXzSIDI= X-Google-Smtp-Source: APXvYqyugPXsY765SBv779fTc7k/pK1gAnSgKfTB9LkQiA71UijoswWgxs1Huu2aJQ2XmJTtL7PBaw== X-Received: by 2002:a63:2747:: with SMTP id n68mr29446675pgn.317.1555344681528; Mon, 15 Apr 2019 09:11:21 -0700 (PDT) Received: from aw-bldr-10.qualcomm.com (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id i2sm73825170pfo.9.2019.04.15.09.11.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 09:11:19 -0700 (PDT) From: Jeffrey Hugo To: bjorn.andersson@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, agross@kernel.org, david.brown@linaro.org Cc: lee.jones@linaro.org, dmitry.torokhov@gmail.com, jikos@kernel.org, benjamin.tissoires@redhat.com, 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 3/3] arm64: dts: qcom: Add Lenovo Miix 630 Date: Mon, 15 Apr 2019 09:11:15 -0700 Message-Id: <20190415161115.16466-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 This adds the initial DT for the Lenovo Miix 630 laptop. Supported functionality includes USB (host), microSD-card, keyboard, and trackpad. Signed-off-by: Jeffrey Hugo --- arch/arm64/boot/dts/qcom/Makefile | 1 + .../boot/dts/qcom/msm8998-clamshell.dtsi | 278 ++++++++++++++++++ .../boot/dts/qcom/msm8998-lenovo-miix-630.dts | 30 ++ 3 files changed, 309 insertions(+) create mode 100644 arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi create mode 100644 arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 21d548f02d39..c3e4307bcbd4 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-mtp.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8992-bullhead-rev-101.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8994-angler-rev-101.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8996-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM) += msm8998-lenovo-miix-630.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8998-mtp.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm845-mtp.dtb dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-1000.dtb diff --git a/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi b/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi new file mode 100644 index 000000000000..1a341d4b1597 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi @@ -0,0 +1,278 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2019, Jeffrey Hugo. All rights reserved. */ + +/* + * Common include for MSM8998 clamshell devices, ie the Lenovo Miix 630, + * Asus NovaGo TP370QL, and HP Envy x2. All three devices are basically the + * same, with differences in peripherals. + */ + +#include "msm8998.dtsi" +#include "pm8998.dtsi" +#include "pm8005.dtsi" + +/ { + chosen { + }; + + thermal-zones { + battery-thermal { + polling-delay-passive = <250>; + polling-delay = <1000>; + + thermal-sensors = <&tsens0 0>; + + trips { + battery_crit: trip0 { + temperature = <60000>; + hysteresis = <2000>; + type = "critical"; + }; + }; + }; + + skin-thermal { + polling-delay-passive = <250>; + polling-delay = <1000>; + + thermal-sensors = <&tsens1 5>; + + trips { + skin_alert: trip0 { + temperature = <44000>; + hysteresis = <2000>; + type = "passive"; + }; + + skip_crit: trip1 { + temperature = <70000>; + hysteresis = <2000>; + type = "critical"; + }; + }; + }; + }; + + vph_pwr: vph-pwr-regulator { + compatible = "regulator-fixed"; + regulator-name = "vph_pwr"; + regulator-always-on; + regulator-boot-on; + }; +}; + +&qusb2phy { + status = "okay"; + + vdda-pll-supply = <&vreg_l12a_1p8>; + vdda-phy-dpdm-supply = <&vreg_l24a_3p075>; +}; + +&rpm_requests { + pm8998-regulators { + compatible = "qcom,rpm-pm8998-regulators"; + + vdd_s1-supply = <&vph_pwr>; + vdd_s2-supply = <&vph_pwr>; + vdd_s3-supply = <&vph_pwr>; + vdd_s4-supply = <&vph_pwr>; + vdd_s5-supply = <&vph_pwr>; + vdd_s6-supply = <&vph_pwr>; + vdd_s7-supply = <&vph_pwr>; + vdd_s8-supply = <&vph_pwr>; + vdd_s9-supply = <&vph_pwr>; + vdd_s10-supply = <&vph_pwr>; + vdd_s11-supply = <&vph_pwr>; + vdd_s12-supply = <&vph_pwr>; + vdd_s13-supply = <&vph_pwr>; + vdd_l1_l27-supply = <&vreg_s7a_1p025>; + vdd_l2_l8_l17-supply = <&vreg_s3a_1p35>; + vdd_l3_l11-supply = <&vreg_s7a_1p025>; + vdd_l4_l5-supply = <&vreg_s7a_1p025>; + vdd_l6-supply = <&vreg_s5a_2p04>; + vdd_l7_l12_l14_l15-supply = <&vreg_s5a_2p04>; + vdd_l9-supply = <&vph_pwr>; + vdd_l10_l23_l25-supply = <&vph_pwr>; + vdd_l13_l19_l21-supply = <&vph_pwr>; + vdd_l16_l28-supply = <&vph_pwr>; + vdd_l18_l22-supply = <&vph_pwr>; + vdd_l20_l24-supply = <&vph_pwr>; + vdd_l26-supply = <&vreg_s3a_1p35>; + vdd_lvs1_lvs2-supply = <&vreg_s4a_1p8>; + + vreg_s3a_1p35: s3 { + regulator-min-microvolt = <1352000>; + regulator-max-microvolt = <1352000>; + }; + vreg_s4a_1p8: s4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-allow-set-load; + }; + vreg_s5a_2p04: s5 { + regulator-min-microvolt = <1904000>; + regulator-max-microvolt = <2040000>; + }; + vreg_s7a_1p025: s7 { + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <1028000>; + }; + vreg_l1a_0p875: l1 { + regulator-min-microvolt = <880000>; + regulator-max-microvolt = <880000>; + regulator-allow-set-load; + }; + vreg_l2a_1p2: l2 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-allow-set-load; + }; + vreg_l3a_1p0: l3 { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + }; + vreg_l5a_0p8: l5 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <800000>; + }; + vreg_l6a_1p8: l6 { + regulator-min-microvolt = <1808000>; + regulator-max-microvolt = <1808000>; + }; + vreg_l7a_1p8: l7 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + vreg_l8a_1p2: l8 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + }; + vreg_l9a_1p8: l9 { + regulator-min-microvolt = <1808000>; + regulator-max-microvolt = <2960000>; + }; + vreg_l10a_1p8: l10 { + regulator-min-microvolt = <1808000>; + regulator-max-microvolt = <2960000>; + }; + vreg_l11a_1p0: l11 { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + }; + vreg_l12a_1p8: l12 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + vreg_l13a_2p95: l13 { + regulator-min-microvolt = <1808000>; + regulator-max-microvolt = <2960000>; + }; + vreg_l14a_1p88: l14 { + regulator-min-microvolt = <1880000>; + regulator-max-microvolt = <1880000>; + }; + vreg_15a_1p8: l15 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + vreg_l16a_2p7: l16 { + regulator-min-microvolt = <2704000>; + regulator-max-microvolt = <2704000>; + }; + vreg_l17a_1p3: l17 { + regulator-min-microvolt = <1304000>; + regulator-max-microvolt = <1304000>; + }; + vreg_l18a_2p7: l18 { + regulator-min-microvolt = <2704000>; + regulator-max-microvolt = <2704000>; + }; + vreg_l19a_3p0: l19 { + regulator-min-microvolt = <3008000>; + regulator-max-microvolt = <3008000>; + }; + vreg_l20a_2p95: l20 { + regulator-min-microvolt = <2960000>; + regulator-max-microvolt = <2960000>; + regulator-allow-set-load; + }; + vreg_l21a_2p95: l21 { + regulator-min-microvolt = <2960000>; + regulator-max-microvolt = <2960000>; + regulator-allow-set-load; + regulator-system-load = <800000>; + }; + vreg_l22a_2p85: l22 { + regulator-min-microvolt = <2864000>; + regulator-max-microvolt = <2864000>; + }; + vreg_l23a_3p3: l23 { + regulator-min-microvolt = <3312000>; + regulator-max-microvolt = <3312000>; + }; + vreg_l24a_3p075: l24 { + regulator-min-microvolt = <3088000>; + regulator-max-microvolt = <3088000>; + }; + vreg_l25a_3p3: l25 { + regulator-min-microvolt = <3104000>; + regulator-max-microvolt = <3312000>; + }; + vreg_l26a_1p2: l26 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + }; + vreg_l28_3p0: l28 { + regulator-min-microvolt = <3008000>; + regulator-max-microvolt = <3008000>; + }; + + vreg_lvs1a_1p8: lvs1 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + vreg_lvs2a_1p8: lvs2 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + }; +}; + +&tlmm { + gpio-reserved-ranges = <0 4>, <81 4>; + + touchpad: touchpad { + config { + pins = "gpio123"; + bias-pull-up; /* pull up */ + }; + }; +}; + +&sdhc2 { + status = "okay"; + + vmmc-supply = <&vreg_l21a_2p95>; + vqmmc-supply = <&vreg_l13a_2p95>; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>; + pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>; +}; + +&usb3 { + status = "okay"; +}; + +&usb3_dwc3 { + dr_mode = "host"; /* Force to host until we have Type-C hooked up */ +}; + +&usb3phy { + status = "okay"; + + vdda-phy-supply = <&vreg_l1a_0p875>; + vdda-pll-supply = <&vreg_l2a_1p2>; +}; diff --git a/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts b/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts new file mode 100644 index 000000000000..c2b43f7ed137 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts @@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2019, Jeffrey Hugo. All rights reserved. */ + +/dts-v1/; + +#include "msm8998-clamshell.dtsi" + +/ { + model = "Lenovo Miix 630"; + compatible = "lenovo,miix-630", "qcom,msm8998"; +}; + +&blsp1_i2c6 { + status = "okay"; + + keyboard@3a { + compatible = "elan,combo400-i2c", "hid-over-i2c"; + interrupt-parent = <&tlmm>; + interrupts = <0x79 IRQ_TYPE_LEVEL_LOW>; + reg = <0x3a>; + hid-descr-addr = <0x0001>; + + pinctrl-names = "default"; + pinctrl-0 = <&touchpad>; + }; +}; + +&sdhc2 { + cd-gpios = <&tlmm 95 GPIO_ACTIVE_HIGH>; +};