From patchwork Fri Nov 4 06:19:38 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: 621426 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 E4E66C433FE for ; Fri, 4 Nov 2022 06:20:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230454AbiKDGUB (ORCPT ); Fri, 4 Nov 2022 02:20:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230507AbiKDGT5 (ORCPT ); Fri, 4 Nov 2022 02:19:57 -0400 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 028302A277 for ; Thu, 3 Nov 2022 23:19:55 -0700 (PDT) Received: by mail-pj1-x1035.google.com with SMTP id b11so3690534pjp.2 for ; Thu, 03 Nov 2022 23:19:55 -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 :message-id:reply-to; bh=/7fcvrE1BvqWs8Ve2suGBYVJ5y1iMJPXMU/J5Xu4wR0=; b=Fv8JFnY1fEVLZ45vHZSI+4x2pni6knHzssyuKD1fJYg7FyicuKTQpljdMAnL+UjJhA qF6mtl9lPv+xoB82RJf9AMF+U15ygFVUMMAgX+Xa0zV3oIv2CXzrQH0V1GC60Qq0TuEm tp0/WgeQTn1T87upTxz/Lrxcmrud2jNaNxKm3RzDzKZu8Yt/PLFuUIXwIeIxsVTqoUA1 1DQFeenjqFDmwrOKCiBC4kfOzoAJnmbgPf3ICpepm8cBQvI2gTx/gPEVpkSybvmyrtua EOqu2ocOMo/7lOumid1SqUQf+etj5p+q5MxPpOjHhp5Imz5DQXn/ynRwEIuAD6sd8XVC tksw== 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:message-id:reply-to; bh=/7fcvrE1BvqWs8Ve2suGBYVJ5y1iMJPXMU/J5Xu4wR0=; b=ZU+fWmxdJ/AM7PHxPb/XsvdTqbGoUHecT5U6B2YofnYbHDylb4FSBopcOHcJaD/iuN Ht6Wo5Y0fdbyJ0hchSVFqciVzOu1tudHi7cAL346Ckouvx9GxLn/iQ7fvGqN/C5bVsDm 4CzLfoFkpAre3LwOCkWODVOUYelXHotgoOZ2zBwAUjyrQdOxjcDuxlFEmqYuzn36M21x LHL+NYWaOzqGWhN1G1HNJ/iioMfaaOhC6sVVsgxF6qmVnKJt0km5PLhTFYfsySao5bCM G+5sL/Rx6fXyJOCVozCe2EHf0foRYOYU7QJe3OvTHMaF8Rl8Q7xYlQ8cnmhDS47v9Djb Gr+g== X-Gm-Message-State: ACrzQf0RAPnZJ/EqR+Gcvn3RZiHrugrCdAv/7s7a3p69d9+zFu9o+qwk 6oyRNGooIYryUKlYs6OJue3znQ== X-Google-Smtp-Source: AMsMyM7HUCTgSSSOEHRmkgeaTplAG3bW53OxKgNyCht+XOwqyLgeV07r9N3NgUxw/HLcWS037Pp3TQ== X-Received: by 2002:a17:902:d48a:b0:187:2b1d:10e2 with SMTP id c10-20020a170902d48a00b001872b1d10e2mr21618516plg.86.1667542795483; Thu, 03 Nov 2022 23:19:55 -0700 (PDT) Received: from liang-Predator-PH517-52.. (2001-b400-e306-842b-9ec5-b6d1-6a82-aa11.emome-ip6.hinet.net. [2001:b400:e306:842b:9ec5:b6d1:6a82:aa11]) by smtp.gmail.com with ESMTPSA id r18-20020aa79892000000b0056bf24f0837sm1764687pfl.166.2022.11.03.23.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 23:19:55 -0700 (PDT) From: Sheng-Liang Pan To: LKML Cc: dianders@chromium.org, Sheng-Liang Pan , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Konrad Dybcio , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v10 1/4] dt-bindings: arm: qcom: Separate LTE/WIFI SKU for sc7280-evoker Date: Fri, 4 Nov 2022 14:19:38 +0800 Message-Id: <20221104141515.v10.1.Ic800ee7b604bcb0519ca404600d7be2352725686@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104061941.2739938-1-sheng-liang.pan@quanta.corp-partner.google.com> References: <20221104061941.2739938-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 --- Changes in v4: - fix typo in tittle and commit - recover change for trackpad and touchscreen 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 207e282602064..04928ca8cd556 100644 --- a/Documentation/devicetree/bindings/arm/qcom.yaml +++ b/Documentation/devicetree/bindings/arm/qcom.yaml @@ -592,6 +592,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 Fri Nov 4 06:19:39 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: 621816 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 6F0B0C43217 for ; Fri, 4 Nov 2022 06:23:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229882AbiKDGXm (ORCPT ); Fri, 4 Nov 2022 02:23:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229532AbiKDGXW (ORCPT ); Fri, 4 Nov 2022 02:23:22 -0400 Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EAF12A96D for ; Thu, 3 Nov 2022 23:22:56 -0700 (PDT) Received: by mail-pg1-x52c.google.com with SMTP id 64so3601359pgc.5 for ; Thu, 03 Nov 2022 23:22:56 -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 :message-id:reply-to; bh=rN5pIXYHIPWnZBzWC0xE3jiOY/tjCziNvlEjCF/QMuE=; b=Vv5vftiaBRe36ebypWwGMDEDqq2U2rZSj8gqc13PGu4uK5D5SP9mbEIxnN22z5wd0e yS+5FXBLsb++ATQ5SVhjM2sWHkdKDNPZz0O2kVat8YKpnntQHDS6+gyw9PJr4V24X0iT vbOQIXjoVroGYZku8VitureuQ4JmrnYmonOQo9oHbFbtKGLs7DfEmi6mLtH97M34xKMl BmequZSpIoMtTtLm32IFP2wRZKNOk3a/oj/jSmhYN7EaCpN0CHONFebd/EdviKBDCTPa PuGn4v2XNlZUr9KvnWzngKwXC7IEIfVaRzib+MNH7hDWu08qcElnhGNbZB9qzS/XABGq Vd8g== 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:message-id:reply-to; bh=rN5pIXYHIPWnZBzWC0xE3jiOY/tjCziNvlEjCF/QMuE=; b=Bqyk7HCvPIUZ0FZsTr9vXwFoRoeK2j9uC3SRccvreFw3A+UYKFQMvZrNzOpeB74D/M oo/QeRpopdJ+1LAQWL++eFcB/7uqdALUP201InnqV/2DgmV6dXOQFiNwekyyrx9G9h3Z NIN3dMFNDu7/bl/bAiEGFrENNVtW0qA+h/zqNioc2YXPrvyTzdI0ij02/NMxkcHAqtIv fzijAQFhJnxw7JeQ/17RLkluyYuVuAVGIIDBWz9shgNhSPqvRrV650NmWZy0ehAdGNDO WDTryNI48nZrnuubKk7hUFDX5+mb0yZyezF/c4eaY+CD7k/GinahFp97hG5CFET+QBKl eVpA== X-Gm-Message-State: ACrzQf18kn338aMk9kUlSrydbqx0Uh9yWq8cYNbt9sFtHrYVDpYT913U EQrOY/fkgcBqoBBECvBSzOkiMA== X-Google-Smtp-Source: AMsMyM4XGU36JCGVsmwMwYz+qSlwhraEkeMl4xmDImBGE/P91S6F2YTWvj2H4M6lBtlqQs5Ds01Tgw== X-Received: by 2002:a63:5d0b:0:b0:464:bb2b:9b0e with SMTP id r11-20020a635d0b000000b00464bb2b9b0emr28671723pgb.583.1667542975530; Thu, 03 Nov 2022 23:22:55 -0700 (PDT) Received: from liang-Predator-PH517-52.. (2001-b400-e306-842b-9ec5-b6d1-6a82-aa11.emome-ip6.hinet.net. [2001:b400:e306:842b:9ec5:b6d1:6a82:aa11]) by smtp.gmail.com with ESMTPSA id r18-20020aa79892000000b0056bf24f0837sm1764687pfl.166.2022.11.03.23.22.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 23:22:55 -0700 (PDT) From: Sheng-Liang Pan To: LKML Cc: dianders@chromium.org, Sheng-Liang Pan , Andy Gross , Bjorn Andersson , Konrad Dybcio , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v10 2/4] arm64: dts: qcom: sc7280: Add LTE SKU for sc7280-evoker family Date: Fri, 4 Nov 2022 14:19:39 +0800 Message-Id: <20221104141515.v10.2.If03e9e85e63ece4b1599db841c90ed785c47a4be@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104061941.2739938-1-sheng-liang.pan@quanta.corp-partner.google.com> References: <20221104061941.2739938-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 --- Changes in v8: - updated patch subjects Changes in v5: - recover whitespace change Changes in v4: - recover 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 b0558d3389e5a..6f234995284b2 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -106,7 +106,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 739e81bd6d689..a6015491c6082 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 Fri Nov 4 06:19:40 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: 621425 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 09D54C4332F for ; Fri, 4 Nov 2022 06:28:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229756AbiKDG2o (ORCPT ); Fri, 4 Nov 2022 02:28:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229481AbiKDG2n (ORCPT ); Fri, 4 Nov 2022 02:28:43 -0400 Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40F3F1EADC for ; Thu, 3 Nov 2022 23:28:43 -0700 (PDT) Received: by mail-pg1-x52b.google.com with SMTP id h193so3581802pgc.10 for ; Thu, 03 Nov 2022 23:28:43 -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 :message-id:reply-to; bh=XwU1VZF8+6iJFAuGjdLVREmySRqI+EDvo5yioZX/3UI=; b=3rkkgT/m2ZMg9HxDIIO8mEURZiqHTfSFqA/iOzp3s+I7nR0leeuva4qDhA2sZ54Ji6 LKIsV2C0h3gKkDXe0iK0kZFepAyWf3z9UvqNdGLFLG89pIJU/uqayy7DVFZwV9iLrn3z aFwLmMjwhbUgZAh2rPLxMy9p8hPrI3jJB4Js14DZhYbEToOTZcqtS3yt8DowlFnWXtJo cCempueSMQpHEGf1UMYyhKVWeivdAS4iVEWqjHwUS0ZXEKMCMvCrRISKzDj2I0Zh9JHY BfZjMPPumWrenTL9ThjuDOB4I33umuAVbk5lmQ46H8uNRD8tT3BgGPxwEWRmZmTzDkE7 q7NQ== 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:message-id:reply-to; bh=XwU1VZF8+6iJFAuGjdLVREmySRqI+EDvo5yioZX/3UI=; b=jFI8sjbnRc6dGCE1seUrbAv6FUH8K/BIRAxlh8lONkWtFzK27GrMKMs9L21TDgSBBx oeyadL7XeUbewjEL2Cxp5x6JxSsFxmvIOjcGr6uzolWTRSlwOeY5HkJBlFuG0qBkL8aH jPCcfK3eJ4VDdoGmazxLroFnecMbfu25Q5xaRr6tsCbyCChK2v7Bp+8UTGpLTa6iB4VB vPLe3VIyl7jXQ1HF+tNAt/SHJld5bWcuqw11lanySU69zVU/aHtXqCcJqvSms4Ols0hH b6NpodspP8faw086NCrFX02/MM5Ap7gEomKQrFhA6FTT1qoCVsKK2ABFLm1oU+h9XkNT ZC2A== X-Gm-Message-State: ACrzQf1mLN1vj6GJtamWM1RN0TYbhBZQruOo13CScEXh914e7uHwul7/ oKOyGkXUp6tVApgqlB754xP8Bg== X-Google-Smtp-Source: AMsMyM72X8JFynUdAN6IASTpfoYmQSmTuX7LJOkhAKEfhqJnKQTxtnR2kwPbvpMmdK5a2mQG7pz5bw== X-Received: by 2002:a63:1c52:0:b0:470:a4a:66b3 with SMTP id c18-20020a631c52000000b004700a4a66b3mr10021540pgm.573.1667543322692; Thu, 03 Nov 2022 23:28:42 -0700 (PDT) Received: from liang-Predator-PH517-52.. (2001-b400-e306-842b-9ec5-b6d1-6a82-aa11.emome-ip6.hinet.net. [2001:b400:e306:842b:9ec5:b6d1:6a82:aa11]) by smtp.gmail.com with ESMTPSA id r18-20020aa79892000000b0056bf24f0837sm1764687pfl.166.2022.11.03.23.28.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 23:28:42 -0700 (PDT) From: Sheng-Liang Pan To: LKML Cc: dianders@chromium.org, Sheng-Liang Pan , Andy Gross , Bjorn Andersson , Konrad Dybcio , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v10 3/4] arm64: dts: qcom: sc7280: Add touchscreen and touchpad support for evoker Date: Fri, 4 Nov 2022 14:19:40 +0800 Message-Id: <20221104141515.v10.3.I3ac715e729f6f9b5a3e3001b155df4f9d14e6186@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104061941.2739938-1-sheng-liang.pan@quanta.corp-partner.google.com> References: <20221104061941.2739938-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 Reviewed-by: Douglas Anderson --- Changes in v8: - updated patch subjects Changes in v7: - add compiatable for gt7986 Changes in v6: - add removed pinctrl and align touchscreen label with herobrine board Changes in v5: - new patch for Touchscreen/trackpad in 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 a6015491c6082..706dd82a70138 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,gt7986u", "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>; }; }; From patchwork Fri Nov 4 06:19:41 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: 621815 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 D8A57C4332F for ; Fri, 4 Nov 2022 06:29:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229567AbiKDG3e (ORCPT ); Fri, 4 Nov 2022 02:29:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229882AbiKDG3d (ORCPT ); Fri, 4 Nov 2022 02:29:33 -0400 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5EDB1286DA for ; Thu, 3 Nov 2022 23:29:32 -0700 (PDT) Received: by mail-pf1-x430.google.com with SMTP id q9so3694125pfg.5 for ; Thu, 03 Nov 2022 23:29:32 -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 :message-id:reply-to; bh=SxFg7HXpZ+LzNmI03TKgAta5PVasE7I6+Po/GSpLci0=; b=Ku7F2bl3irc/VRVUlNhaaN8IT1wmr9OCKQsAZv9ztMfUd49lTX1pYwy7jqWuE0TVMo X6nEk+VQ6RZQqvhjJmW9hH9yXbSXcARoLOyblr39K9seyoX6gjbpGp4grAIEqCvCPVya TLAWyo4oiZ2Zm+UouNqITHeOE+j+N1XpG/LIkkm9WXhEetSBhFDLFSNu9d9DxYHVnS8u 05gnQjkNN0rhaN8tuu3xOYC+hxr57oHxUQwGt8PBQJWC9AFkrgjzPhifFQgBC0yAXy4O MHh2ydSVEa/K0A+b37o0X9rm7P2h+qon1WsNbBSLhK4/xHiXE1MiTQd5qwvO6eGbcOmv UXMQ== 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:message-id:reply-to; bh=SxFg7HXpZ+LzNmI03TKgAta5PVasE7I6+Po/GSpLci0=; b=UA19LLHI7DgoG2jVToh8QyJQ/QQIJInzPE9bJUCUhklPtpD+trNGXXaVYhGKPhGZ7f 78AkneFWGvWlTizlgupc/WdqMm5wKcIgMXOc5V9SXvPLMnl6HAnxjZU1uvrxNrkFnIaJ 3S3O9QiYCRPhPij2T/MFkXMIKrHcUHAgzyCaZciYRkiguCxLWx1w7JyQpIJBqGdmvvHr dCpPiZuEkhDadVToTRaxYs61KyZkDHFFM/JYq0cRM/CyOEDEr98pGmKh5PbwOyiJPrk8 r+6lNuh5tn1wOT7Ggt2nkEi87TiXs7VBfTgRSY8ESv5yQTuyWyy/NaRbmtggMuMLFN6r VZIA== X-Gm-Message-State: ACrzQf2RR2dYurLNLL1+F3DWaNsri+I9TYdIUaW651Zi2XDXE4lu7XqW 2/jLCI+dQKh5lUIAnHskHoIi56WsH2LHVw== X-Google-Smtp-Source: AMsMyM5K4ff6vcUwtrZl0lxUOHrxCUXhlw//8AWk8Y9AhXCUkFhFFtS0Zv+P3v/T20SmSpSiCJzJjA== X-Received: by 2002:a63:455e:0:b0:439:9496:ddd8 with SMTP id u30-20020a63455e000000b004399496ddd8mr28969212pgk.261.1667543371792; Thu, 03 Nov 2022 23:29:31 -0700 (PDT) Received: from liang-Predator-PH517-52.. (2001-b400-e306-842b-9ec5-b6d1-6a82-aa11.emome-ip6.hinet.net. [2001:b400:e306:842b:9ec5:b6d1:6a82:aa11]) by smtp.gmail.com with ESMTPSA id r18-20020aa79892000000b0056bf24f0837sm1764687pfl.166.2022.11.03.23.29.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 23:29:31 -0700 (PDT) From: Sheng-Liang Pan To: LKML Cc: dianders@chromium.org, Sheng-Liang Pan , Andy Gross , Bjorn Andersson , Konrad Dybcio , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v10 4/4] arm64: dts: qcom: sc7280: add sc7280-herobrine-audio-rt5682-3mic3.dtsi for evoker Date: Fri, 4 Nov 2022 14:19:41 +0800 Message-Id: <20221104141515.v10.4.I9718ac3622fa550e432209ae5c95c87b873a0f87@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221104061941.2739938-1-sheng-liang.pan@quanta.corp-partner.google.com> References: <20221104061941.2739938-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 add specific 3mic setting as sc7280-herobrine-audio-rt5682-3mic.dtsi, so we can include sc7280-herobrine-audio-rt5682-3mic.dtsi for evoker as it uses rt5682 with 3 mics. Signed-off-by: Sheng-Liang Pan --- Changes in v10: - add evoker include specific sc7280-herobrine-audio-rt5682-3mic.dtsi setting .../sc7280-herobrine-audio-rt5682-3mic.dtsi | 194 ++++++++++++++++++ .../boot/dts/qcom/sc7280-herobrine-evoker.dts | 2 + 2 files changed, 196 insertions(+) create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi new file mode 100644 index 0000000000000..01bc8ee93b19a --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi @@ -0,0 +1,194 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * + * This file defines the common audio settings for the child boards + * using rt5682 codec and having 3 dmics connected to sc7280. + * + * Copyright 2022 Google LLC. + */ + +/ { + /* BOARD-SPECIFIC TOP LEVEL NODES */ + sound: sound { + compatible = "google,sc7280-herobrine"; + model = "sc7280-rt5682-max98360a-3mic"; + + status = "okay"; + audio-routing = + "VA DMIC0", "vdd-micb", + "VA DMIC1", "vdd-micb", + "VA DMIC2", "vdd-micb", + "VA DMIC3", "vdd-micb", + + "Headphone Jack", "HPOL", + "Headphone Jack", "HPOR"; + + #address-cells = <1>; + #size-cells = <0>; + + dai-link@0 { + link-name = "MAX98360"; + reg = <0>; + + cpu { + sound-dai = <&lpass_cpu MI2S_SECONDARY>; + }; + + codec { + sound-dai = <&max98360a>; + }; + }; + + dai-link@1 { + link-name = "DisplayPort"; + reg = <1>; + + cpu { + sound-dai = <&lpass_cpu LPASS_DP_RX>; + }; + + codec { + sound-dai = <&mdss_dp>; + }; + }; + + dai-link@2 { + link-name = "ALC5682"; + reg = <2>; + + cpu { + sound-dai = <&lpass_cpu MI2S_PRIMARY>; + }; + + codec { + sound-dai = <&alc5682 0 /* aif1 */>; + }; + }; + + dai-link@4 { + link-name = "DMIC"; + reg = <4>; + + cpu { + sound-dai = <&lpass_cpu LPASS_CDC_DMA_VA_TX0>; + }; + + codec { + sound-dai = <&lpass_va_macro 0>; + }; + }; + }; +}; + +hp_i2c: &i2c2 { + status = "okay"; + clock-frequency = <400000>; + + alc5682: codec@1a { + compatible = "realtek,rt5682s"; + reg = <0x1a>; + pinctrl-names = "default"; + pinctrl-0 = <&hp_irq>; + + #sound-dai-cells = <1>; + + interrupt-parent = <&tlmm>; + interrupts = <101 IRQ_TYPE_EDGE_BOTH>; + + AVDD-supply = <&pp1800_alc5682>; + MICVDD-supply = <&pp3300_codec>; + + realtek,dmic1-data-pin = <1>; + realtek,dmic1-clk-pin = <2>; + realtek,jd-src = <1>; + realtek,dmic-clk-rate-hz = <2048000>; + }; +}; + +&lpass_cpu { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&mi2s0_data0>, <&mi2s0_data1>, <&mi2s0_mclk>, <&mi2s0_sclk>, <&mi2s0_ws>, + <&mi2s1_data0>, <&mi2s1_sclk>, <&mi2s1_ws>; + + #address-cells = <1>; + #size-cells = <0>; + + dai-link@0 { + reg = ; + qcom,playback-sd-lines = <1>; + qcom,capture-sd-lines = <0>; + }; + + dai-link@1 { + reg = ; + qcom,playback-sd-lines = <0>; + }; + + dai-link@5 { + reg = ; + }; + + dai-link@25 { + reg = ; + }; +}; + +&lpass_va_macro { + status = "okay"; + vdd-micb-supply = <&pp1800_l2c>; + pinctrl-0 = <&lpass_dmic01_clk>, <&lpass_dmic01_data>, <&lpass_dmic23_clk>, + <&lpass_dmic23_data>; +}; + +&mi2s0_data0 { + drive-strength = <6>; + bias-disable; +}; + +&mi2s0_data1 { + drive-strength = <6>; + bias-disable; +}; + +&mi2s0_mclk { + drive-strength = <6>; + bias-disable; +}; + +&mi2s0_sclk { + drive-strength = <6>; + bias-disable; +}; + +&mi2s0_ws { + drive-strength = <6>; + bias-disable; +}; + +&lpass_dmic01_clk { + drive-strength = <8>; + bias-disable; +}; + +&lpass_dmic01_clk_sleep { + drive-strength = <2>; +}; + +&lpass_dmic01_data { + bias-pull-down; +}; + +&lpass_dmic23_clk { + drive-strength = <8>; + bias-disable; +}; + +&lpass_dmic23_clk_sleep { + drive-strength = <2>; +}; + +&lpass_dmic23_data { + bias-pull-down; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts index dcdd4eecfe670..d608682f9742b 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts @@ -8,6 +8,8 @@ /dts-v1/; #include "sc7280-herobrine-evoker.dtsi" +#include "sc7280-herobrine-audio-rt5682-3mic.dtsi" + / { model = "Google Evoker";