From patchwork Mon Oct 3 10:27:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheng-Liang Pan X-Patchwork-Id: 612353 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9DF71C433FE for ; Mon, 3 Oct 2022 10:28:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229944AbiJCK2W (ORCPT ); Mon, 3 Oct 2022 06:28:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229911AbiJCK2T (ORCPT ); Mon, 3 Oct 2022 06:28:19 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE4B124BCD for ; Mon, 3 Oct 2022 03:28:18 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id e11-20020a17090a77cb00b00205edbfd646so14894255pjs.1 for ; Mon, 03 Oct 2022 03:28:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quanta-corp-partner-google-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=u2enmpPHba5zlJ2pqDaLIQSBog6hYUzqkszUkthSI4c=; b=HNjBjdseHCVKa53HiGDSCcV0QERfzmK3vTQUauwY08rmRbwuNA3WnIrMnCNV22Ae7o dNouIttHr6+u/y9OVuwHqknCZ2Lz50g6D3NZv6sbOxFs1/rpwKeeP0S/TEcmUXrbQvO8 S9R7uxfacG57Jec0oNZOqq0r9/2Ct1Zh62cD2dRn2xYqj9IyR3jdjbudsY/ebLVQAE06 BsI2r1OG7o89oAzoOV2DRP9/gC8TaAgOmoPgsYckUqcOQ7Ie+3ZwXwfEYLEd449Iv5yO tYKSd1W9YhwLsrsb2tJke1sc723swj8wI5dZqm0vs4MLskgaFIXhTA8X8ZbGiyICF7rK LkHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=u2enmpPHba5zlJ2pqDaLIQSBog6hYUzqkszUkthSI4c=; b=o0fDA99qBpVqBXAuE0VqfD+kOFifgJqNiXu/UcCPTIzAEaNPCgasuHahBOXb2XDEy3 DipPnCfZtfA2Nzdp1FjFkqeN/fnW015qgl5PsPmAcbFejCXqib/eppbGPgVjoPIrja0J 330eP3ZJRgfs74frjfJPwHnr2yC5CBWYzUpn1Gfu89fHlwuHCrUNoeX72QaUPPxwW8+C MT6gzxAVLJsA4jrOMOedG14QQoGOXvOESzu8G0k8UtRBQblDKaRmrSz/L6bIvOO14V1N ceV/Ij7/xFga1tKnVc41yPJPANzhV4rwL4pP1jRrMU5DGy5RwKr0RQ2rrL44CjX+QGqk 6b1Q== X-Gm-Message-State: ACrzQf3hSPByW+jg8shenEsfcVcfj8MTgA4Q2m03OjcUnIGKToxO2IK4 SmV/7X5sZIXhRwvm3o43ecWs2Q== X-Google-Smtp-Source: AMsMyM6cp8atlbhrbU75cKS+MjSEabyCF3ZSZY1q2IhnLuYUTiny0qgeQUcDOPRuDRwOiLKRy79YKw== X-Received: by 2002:a17:90b:33d1:b0:203:7b4b:ba1e with SMTP id lk17-20020a17090b33d100b002037b4bba1emr11436886pjb.128.1664792898216; Mon, 03 Oct 2022 03:28:18 -0700 (PDT) Received: from liang-Predator-PH517-52.. (60-250-232-247.hinet-ip.hinet.net. [60.250.232.247]) by smtp.gmail.com with ESMTPSA id y17-20020a170902b49100b00172951ddb12sm6860249plr.42.2022.10.03.03.28.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 03:28:17 -0700 (PDT) From: Sheng-Liang Pan To: LKML Cc: dianders@chromium.org, Sheng-Liang Pan , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Rob Herring , Stephen Boyd , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v6 1/3] dt-bindings: arm: qcom: Separate LTE/WIFI SKU for sc7280-evoker Date: Mon, 3 Oct 2022 18:27:34 +0800 Message-Id: <20221003182637.v6.1.Ide53082044aac56877c4ff5725777769e377476a@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221003102735.39028-1-sheng-liang.pan@quanta.corp-partner.google.com> References: <20221003102735.39028-1-sheng-liang.pan@quanta.corp-partner.google.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org evoker will have WIFI/LTE SKU, separate it for each different setting. Signed-off-by: Sheng-Liang Pan Reviewed-by: Krzysztof Kozlowski Reviewed-by: Douglas Anderson --- (no changes since v5) Changes in v5: - new patch add touchpad and touchscreen for evoker - remove unnecessary whitespace Changes in v4: - fix typo in tittle and commit - remove change for trackpad and touchscreen Changes in v3: - none Changes in v2: - none Documentation/devicetree/bindings/arm/qcom.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml index 8060c35d003b4..c15a729a6852e 100644 --- a/Documentation/devicetree/bindings/arm/qcom.yaml +++ b/Documentation/devicetree/bindings/arm/qcom.yaml @@ -513,6 +513,11 @@ properties: - const: google,evoker - const: qcom,sc7280 + - description: Google Evoker with LTE (newest rev) + items: + - const: google,evoker-sku512 + - const: qcom,sc7280 + - description: Google Herobrine (newest rev) items: - const: google,herobrine From patchwork Mon Oct 3 10:27:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheng-Liang Pan X-Patchwork-Id: 612010 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50E08C433F5 for ; Mon, 3 Oct 2022 10:28:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229608AbiJCK2Z (ORCPT ); Mon, 3 Oct 2022 06:28:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230004AbiJCK2W (ORCPT ); Mon, 3 Oct 2022 06:28:22 -0400 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B040F24BCD for ; Mon, 3 Oct 2022 03:28:21 -0700 (PDT) Received: by mail-pl1-x632.google.com with SMTP id u24so2312221plq.12 for ; Mon, 03 Oct 2022 03:28:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quanta-corp-partner-google-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=GZF/RIYzZU5gHqugTmczTBwS2A/Y/oQ2QFe1S8xT0YA=; b=mBdua7aK0OpaGL0sJ+rMoV63lzT9pxHUfH0GBirICsAIr2OsSGqsI7QptljWJZ7Etc 3xTtMu7U5mFsUB6XcEnRig2hyI7rcfcQGSJJjWEoDnIV548avkM77u2IU+urXOFkDx8Z ey0DR1U+jSdgtaykZB8No6mEpyLgyGyJtnePBAbs/DBv3jab2C6ltmYQDK7dYyGkwzLC WsQUTOvq69VRjP0C0baVdkFyfUUxQHpuBKixPX0x65BigfMmn0Y36g/tnM1z9PENmBDG CCy4dK5Vnz9Y0NhoXmBfnWtZUVp8dAzfiYiOiaoNmXSKFnLwR3DCIFfazVLkSlOzppiO r0wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=GZF/RIYzZU5gHqugTmczTBwS2A/Y/oQ2QFe1S8xT0YA=; b=EVEKPMzz2P3C62wNYKXEKOzM29I+/v3n6QMQt7DDnBIuAweKP51db3BRFci4hNvSZ7 0Zwg5ihZ8b7IRq4el1ZQrirkm5WoCe52JA7wmiWnG0kfmeXbKCuZnurZrTePCi1HcKI0 cM0Y0RZ9JUmibo+qFRMbxuA4Ph2MqIVPzlquyegG4buisXx7nydhEs8SezdNbdKh6JFy NwkjShQ6luNPA5rw/19FUfdM7GEOtws3cyVh/XDxhxPZhJEG+pudCx++Kx3TjSjADkf7 xjrqGZuRyyUEh8plvRGn07rY4yNmYQ+FdBGEJZH6vOfUWpD+sL9/L/6/S0pEw6sprjvb szSA== X-Gm-Message-State: ACrzQf3yYSL/tE6NkJYyD6wCDaE0vIUtRjFwdHJffpjVvhmTakGtVmm3 MyaWJ+iVEAELJbyUkrdUjzj8Cw== X-Google-Smtp-Source: AMsMyM5BrtTxepMngH87cpejv7ul9sdN0yESw3yLby/s+fFnU1kNIc0AYGJI+0FvGUev1xAr+VGq1g== X-Received: by 2002:a17:902:6acb:b0:17d:c267:2ad9 with SMTP id i11-20020a1709026acb00b0017dc2672ad9mr10218259plt.10.1664792901076; Mon, 03 Oct 2022 03:28:21 -0700 (PDT) Received: from liang-Predator-PH517-52.. (60-250-232-247.hinet-ip.hinet.net. [60.250.232.247]) by smtp.gmail.com with ESMTPSA id y17-20020a170902b49100b00172951ddb12sm6860249plr.42.2022.10.03.03.28.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 03:28:20 -0700 (PDT) From: Sheng-Liang Pan To: LKML Cc: dianders@chromium.org, Sheng-Liang Pan , Andy Gross , Bjorn Andersson , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v6 2/3] arm64: dts: qcom: Add LTE SKU for sc7280-evoker family Date: Mon, 3 Oct 2022 18:27:35 +0800 Message-Id: <20221003182637.v6.2.I1454364ac3d8ecc64677884d6b7d2f3e334e4b4a@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221003102735.39028-1-sheng-liang.pan@quanta.corp-partner.google.com> References: <20221003102735.39028-1-sheng-liang.pan@quanta.corp-partner.google.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org evoker have wifi/lte sku, add different dts for each sku. Signed-off-by: Sheng-Liang Pan Reviewed-by: Douglas Anderson --- (no changes since v5) Changes in v5: - remove unnecessary whitespace Changes in v4: - remove change for trackpad and touchscreen arch/arm64/boot/dts/qcom/Makefile | 3 ++- .../boot/dts/qcom/sc7280-herobrine-evoker-lte.dts | 14 ++++++++++++++ .../boot/dts/qcom/sc7280-herobrine-evoker.dts | 15 +++++++++++++++ ...evoker-r0.dts => sc7280-herobrine-evoker.dtsi} | 7 ------- 4 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts rename arch/arm64/boot/dts/qcom/{sc7280-herobrine-evoker-r0.dts => sc7280-herobrine-evoker.dtsi} (98%) diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 65cb0f714ed6b..91153baeeffae 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -95,7 +95,8 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-crd.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker-r0.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-herobrine-r1.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r0.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1.dtb diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts new file mode 100644 index 0000000000000..3af9224a7492e --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Evoker board device tree source + * + * Copyright 2022 Google LLC. + */ + +#include "sc7280-herobrine-evoker.dts" +#include "sc7280-herobrine-lte-sku.dtsi" + +/ { + model = "Google Evoker with LTE"; + compatible = "google,evoker-sku512", "qcom,sc7280"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts new file mode 100644 index 0000000000000..dcdd4eecfe670 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Evoker board device tree source + * + * Copyright 2022 Google LLC. + */ + +/dts-v1/; + +#include "sc7280-herobrine-evoker.dtsi" + +/ { + model = "Google Evoker"; + compatible = "google,evoker", "qcom,sc7280"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi similarity index 98% rename from arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts rename to arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi index ccbe50b6249ab..e78072159d54b 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi @@ -5,15 +5,8 @@ * Copyright 2022 Google LLC. */ -/dts-v1/; - #include "sc7280-herobrine.dtsi" -/ { - model = "Google Evoker"; - compatible = "google,evoker", "qcom,sc7280"; -}; - /* * ADDITIONS TO FIXED REGULATORS DEFINED IN PARENT DEVICE TREE FILES * From patchwork Mon Oct 3 10:27:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheng-Liang Pan X-Patchwork-Id: 612352 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4309CC433FE for ; Mon, 3 Oct 2022 10:28:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230074AbiJCK2a (ORCPT ); Mon, 3 Oct 2022 06:28:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229881AbiJCK2Z (ORCPT ); Mon, 3 Oct 2022 06:28:25 -0400 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6956E24BCB for ; Mon, 3 Oct 2022 03:28:24 -0700 (PDT) Received: by mail-pf1-x42c.google.com with SMTP id 83so2840602pfw.10 for ; Mon, 03 Oct 2022 03:28:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quanta-corp-partner-google-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=lX+oj6rmvSOLgFkJ4R/ALtfBKBSvjF9wvr9qaq9s7Es=; b=Nh8+bIj3Q9+SLQXMLEQZfrRiO7YfVwcAMifr/Jr5O9scFq7EXvFKQnV6XqJnCSQPlI OPqAXvW5HLjasbcJrHvSOUjkxmNmNdzfSHKnoGzoG30gqGplyjdDQXzLvsQxgYvPeLtS 02eQXq8+g1M6mc0nJ2H/mP2/85a2VzEAkjhCTwxAsSLsvb+aqekjppVwvVNsZgtLgH4y q2kc9eUSaOyao3K2Lv9i9uE1ybdBPEInwcN2rwsli00nSEF9IRdYapxFQlPH8lnZIQqR V/lNwpDnHCLR4Etuu6NOWgY0Eb2HJxiEy6Hkf2Xuv3Cq4A2AVbYPMDk4HEGBBKhBhjMD b+dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=lX+oj6rmvSOLgFkJ4R/ALtfBKBSvjF9wvr9qaq9s7Es=; b=A7cf9ZlHP0hdPHhN2FPI3bhRxcOBo2TfyLE6lHSmCzxoT24Va1qL9k+pYG81nZNHec Hk6CsEGiToeD1nUk+3samjKXofn8COlXojSl5wW3Jcq62nJPYYYKl7uMcPGrtvsb2REM VgORm/M98zMOWGCA2B0hZ5wDpboG+nuDVHYSfmVIWkzM1BEdCjY2cqVVsT93QKDCOzX0 v4T+4TEu+1uC8/TfJBV0eLLEst3lE+rDj1IVTxy9PUuFj5A55H9dRdx9fYd5HBe/pQuF YAPdkv1f74B6KXdFiAXSjGNRUQsiFEePoAinP2p0oCfcvzqM+3SNCtuheTWks0i88QJG L5Ng== X-Gm-Message-State: ACrzQf3ituev9+xAlNseL+hdsW4mRYEawrRoCK293VO+YtA3X27oTLcB NupUjEU+ec+LdsAxgbUhm7S4cg== X-Google-Smtp-Source: AMsMyM48S1WC/3x9VfPH6KQyLJBwL8rocb6TmOeYpGsV2IxPCbe2PPe3FW7eO6FLn5UhW4PZQiUyNQ== X-Received: by 2002:a65:604d:0:b0:43c:9d8c:813a with SMTP id a13-20020a65604d000000b0043c9d8c813amr18665545pgp.572.1664792903863; Mon, 03 Oct 2022 03:28:23 -0700 (PDT) Received: from liang-Predator-PH517-52.. (60-250-232-247.hinet-ip.hinet.net. [60.250.232.247]) by smtp.gmail.com with ESMTPSA id y17-20020a170902b49100b00172951ddb12sm6860249plr.42.2022.10.03.03.28.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 03:28:23 -0700 (PDT) From: Sheng-Liang Pan To: LKML Cc: dianders@chromium.org, Sheng-Liang Pan , Andy Gross , Bjorn Andersson , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v6 3/3] arm64: dts: qcom: Add touchscreen and touchpad support for evoker Date: Mon, 3 Oct 2022 18:27:36 +0800 Message-Id: <20221003182637.v6.3.I50d04dcbe735dda69995cf1078824d671501869e@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221003102735.39028-1-sheng-liang.pan@quanta.corp-partner.google.com> References: <20221003102735.39028-1-sheng-liang.pan@quanta.corp-partner.google.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Change touchpad and touchscreen node for evoker Touchpad: SA461D-1011 Touchscreen: GT7986U Signed-off-by: Sheng-Liang Pan --- Changes in v6: - add removed pinctrl and align touchscreen label with herobrine board Changes in v5: - Touchscreen / trackpad patch new for v5 .../boot/dts/qcom/sc7280-herobrine-evoker.dtsi | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi index e78072159d54b..d1723fbffae67 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi @@ -23,16 +23,15 @@ ap_tp_i2c: &i2c0 { status = "okay"; clock-frequency = <400000>; - trackpad: trackpad@2c { - compatible = "hid-over-i2c"; - reg = <0x2c>; + trackpad: trackpad@15 { + compatible = "elan,ekth3000"; + reg = <0x15>; pinctrl-names = "default"; pinctrl-0 = <&tp_int_odl>; interrupt-parent = <&tlmm>; interrupts = <7 IRQ_TYPE_EDGE_FALLING>; - hid-descr-addr = <0x20>; vcc-supply = <&pp3300_z1>; wakeup-source; @@ -43,9 +42,9 @@ ts_i2c: &i2c13 { status = "okay"; clock-frequency = <400000>; - ap_ts: touchscreen@10 { - compatible = "elan,ekth6915"; - reg = <0x10>; + ap_ts: touchscreen@5d { + compatible = "goodix,gt7375p"; + reg = <0x5d>; pinctrl-names = "default"; pinctrl-0 = <&ts_int_conn>, <&ts_rst_conn>; @@ -54,7 +53,7 @@ ap_ts: touchscreen@10 { reset-gpios = <&tlmm 54 GPIO_ACTIVE_LOW>; - vcc33-supply = <&ts_avdd>; + vdd-supply = <&ts_avdd>; }; };