From patchwork Mon Nov 7 09:43: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: 13034214 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 D889FC43217 for ; Mon, 7 Nov 2022 09:44:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231821AbiKGJoC (ORCPT ); Mon, 7 Nov 2022 04:44:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231783AbiKGJn7 (ORCPT ); Mon, 7 Nov 2022 04:43:59 -0500 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 BDB1A17059 for ; Mon, 7 Nov 2022 01:43:57 -0800 (PST) Received: by mail-pj1-x1035.google.com with SMTP id q1-20020a17090a750100b002139ec1e999so9780405pjk.1 for ; Mon, 07 Nov 2022 01:43:57 -0800 (PST) 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=hcAg6rZ1N2StOt9XFWt6ZKuXVDzbG7N7MgckEsRRewASfrf7NlwJVgFJw7FDEGqti9 yjE+AuXkEwvEjiXiDesviQqPYsnKa8+D7fFqL+jmSH3V6UipfII43wlQ1B7vVyIcZqSm IfLS/7uvKZm18ZkRHaigGtKnBppcjzUWz9vc8gKPrbghl98Dhyunuq4RchHbWqVpn9Xx Vu+Kxg/9v9wY32Wj+KTm3nIzAe0jHnFONO3LKWH/MsYEfUa4o3ftiYF6xFqlmR3Ih81s RhDWGfnoVIiL+rsrdlk9XYeeX7aDSka0j2/XV7ESUtaY47BMdCAxmUvlRYDnxj94at8R y7Iw== 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=xIulSLOpm8J/NQXvZayiZFQJowDAXd/Id9J5+MyhPUni0hoTvYK88mGrjXxbj13pT/ PfvaDraIyoQT6ZeKc1wbxgzJGI8gIb0+PFEbGp+TVEyn4Nb5HVFA9pmOuJ8lyXnse/da VsmFjMn1sgeZ8AL6BJvX8pM5ifQlcJXqS/5gGd/1dfz5u/+c3vG1BqJ1ip69hweL0ZgX NihDmH/4jXyLH3SPU/APFl7BOoJolAYYTq6w48+z+9AfKQhRqIz40ISJBW40n/nIyb4L tu+2PXyQ5FFZZ1LIinHif1BOUewVIE50NkwjY1MasgvxMorFU43ggvcT+COk94/dI39s LssA== X-Gm-Message-State: ACrzQf0GGrK1OjjlmRsQyP7rJ+psiSp6UpNItoX+vQ9dMcWtGiR6syE8 sKwDM4naQWd8a+WwKWv4c8VxgA== X-Google-Smtp-Source: AMsMyM4g0/bpkt7E1iAihW6xJF8JYX2JX12lpYCHLxCgpP2bAnxf3/v9lqDOzSisvQeZCgvzbUjz0Q== X-Received: by 2002:a17:902:c943:b0:187:1572:282b with SMTP id i3-20020a170902c94300b001871572282bmr45338037pla.126.1667814237231; Mon, 07 Nov 2022 01:43:57 -0800 (PST) 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 i2-20020a170902c94200b00186dcc37e17sm4564936pla.210.2022.11.07.01.43.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 01:43:56 -0800 (PST) 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 v11 1/5] dt-bindings: arm: qcom: Separate LTE/WIFI SKU for sc7280-evoker Date: Mon, 7 Nov 2022 17:43:41 +0800 Message-Id: <20221107173954.v11.1.Ic800ee7b604bcb0519ca404600d7be2352725686@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107094345.2838931-1-sheng-liang.pan@quanta.corp-partner.google.com> References: <20221107094345.2838931-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 Mon Nov 7 09:43:42 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: 13034215 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 AEA6BC433FE for ; Mon, 7 Nov 2022 09:44:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231770AbiKGJoh (ORCPT ); Mon, 7 Nov 2022 04:44:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231861AbiKGJoa (ORCPT ); Mon, 7 Nov 2022 04:44:30 -0500 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 868351758D for ; Mon, 7 Nov 2022 01:44:29 -0800 (PST) Received: by mail-pl1-x636.google.com with SMTP id l2so10532194pld.13 for ; Mon, 07 Nov 2022 01:44:29 -0800 (PST) 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=pJifRJMD3H6Zwg9dEMB5fXXtWtJk8Fn7PNdc60fysMk=; b=2rUVlEhqS58E3yYy81iZwVG4aGUgSqO1Waj/gDha3j9iYtrXiHti5uZObzKFlDw79n HQEsnfRZ3cdGNgxymZnJP64vD+17NJDsoAVRkGa+X1KBtfwrr0gnql87xZEmcdoywOuq KbGZlxbzg6bJKGTRu+cOjq/jdTgU1IhA0ynT7pveDllzWk2uVN31GYWwHD7dbobfYo3a Sb2xyXyOdF6pLdvJp3qA7wJyjBCyuSyM7h+bLVc5S6zkduHL/AU2GrdK6/gH23Oq+qs9 23Sc7XTyyblAgv26T+0p0LeYw6u6Sfnjxs+jo33IB/oD5jlKSKYjDB4/GcNsUbg8Cfmi 25zg== 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=pJifRJMD3H6Zwg9dEMB5fXXtWtJk8Fn7PNdc60fysMk=; b=YAvxecpFanFmiH+G0B9i99CDKzFQG++dYHueWiPeI+IQrioSkRSde8YJSKTwWCx7hB PI3gO747XrE3OMnjnTe6DtZffJYdmVGjDpHFABDYnubQoEY3HL7AKpXvVVbVwxlJJzlW 7qYoWWA1w/Vq2Ln7Us6IFF3wvZoj8fDMDfWc6ZREtawUeYbCnP4LYN2ySNNZTpd4VgDA WkRi+/4zdDlHykhaPt7ucAQz1jg4WroeceMruP/uqnlCVNn2LCPUDT5otXwKWCje9+fC V3XQCT8/peywJzPnb0gRUetflqph8eO7aF16Yn2B1nj9nRW99lBNob8I7ul5pdnlHU0z FhTw== X-Gm-Message-State: ACrzQf3rfmyWnmC7ACN8e2BPurfnZZa4QxbmkHogvEZmrDd1VsTYhvdu 95NSk1OOezmc3lj7ZHsOkhPiQg== X-Google-Smtp-Source: AMsMyM4awBx4BdqauFnYo2kSyGWNCuvR/h6TynpVA3A3QZnfFaLuqjh7Ah0DH2hAmb/vtvsqoa1tLg== X-Received: by 2002:a17:90b:3b43:b0:213:fa1a:5326 with SMTP id ot3-20020a17090b3b4300b00213fa1a5326mr36337079pjb.20.1667814268987; Mon, 07 Nov 2022 01:44:28 -0800 (PST) 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 i2-20020a170902c94200b00186dcc37e17sm4564936pla.210.2022.11.07.01.44.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 01:44:28 -0800 (PST) From: Sheng-Liang Pan To: LKML Cc: dianders@chromium.org, Sheng-Liang Pan , Konrad Dybcio , Andy Gross , Bjorn Andersson , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v11 2/5] arm64: dts: qcom: sc7280: Add LTE SKU for sc7280-evoker family Date: Mon, 7 Nov 2022 17:43:42 +0800 Message-Id: <20221107173954.v11.2.If03e9e85e63ece4b1599db841c90ed785c47a4be@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107094345.2838931-1-sheng-liang.pan@quanta.corp-partner.google.com> References: <20221107094345.2838931-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 Reviewed-by: Konrad Dybcio --- 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 Mon Nov 7 09:43:43 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: 13034216 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 57074C433FE for ; Mon, 7 Nov 2022 09:45:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231673AbiKGJpm (ORCPT ); Mon, 7 Nov 2022 04:45:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231158AbiKGJpl (ORCPT ); Mon, 7 Nov 2022 04:45:41 -0500 Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B20055AC for ; Mon, 7 Nov 2022 01:45:40 -0800 (PST) Received: by mail-pg1-x52a.google.com with SMTP id v3so9979816pgh.4 for ; Mon, 07 Nov 2022 01:45:40 -0800 (PST) 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=vI8bag7CRDrcM5vY6bidsgJO6YZAPPNb6mhinAYmcpo=; b=UTcvf666EPrKmS/7NEochTvJqLQejMzRbvhyzCswuhBMdAoDA7zaZXFPor8wd9chY4 qOukA+2qkfcqSBFAO9hy5Lzb3YXQuLhBHdXS/3b8Q/nLzTsb6xJ99wS9DM05TEQkaRgm QeNQtqH2YduwsxVeWJeN8KgIC6nbSxH05QqFMEQB1FRWYf2yIlBqR3QpR93DxTq2j/37 ir13/9VQMC7IoMmtwVgcA4YYT/7zas8WElmWzVT6pVic8v+4eqAGIdnx7UT32Yqa7qWM lj7Lci2y94pv9Lll3PYeRG4nJ0856kS83vF5uW2EL1ZdGGPszHk2HC584yXhnH7ORK/v v4Og== 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=vI8bag7CRDrcM5vY6bidsgJO6YZAPPNb6mhinAYmcpo=; b=jPBCJ6CULpfMfaoAW3mjJXFBmNkNUR98R8cRH3N1ohaZope3BPzov52YRbhU8f2n0/ Qbrcs11rt61iH8iM8nr3faPFZTdwSStvBm9doHZ58EMa1G9VspZizXP/tkB0JHYGc6DN +R1J+snO1OPJfHyEnzlYNZVre0GGT+ZxTfKMfaLi2Sp8y2mAppIQGy5BVn7dAgJLmNMY MnxGOHMMjgwWBTNpprYsxd83Zasf0BtqWL5PDZ+XIcSGNjQnOPIPWOLP/gAS65P8gMgL Lj4b9mLnOftkqQ468sRkfRKoPDeV3UyR9RcY3VZ3PIcNNprNOq172JGCCXZ5xqNjluG5 +ybA== X-Gm-Message-State: ACrzQf1AliJV01BVvCFQg+DukE74LE5cz+FPkVtN5hrIB2p6UQTT+m4T ScnaTXSLmYU4zOTOaaPIcmMtmA== X-Google-Smtp-Source: AMsMyM5hx3+QrIK4mCNnqm1+SQ190XiEOcQHxpJ/600nbzkHxGQLTDMmtaYFk06RJeST+AXZH3VjcA== X-Received: by 2002:a05:6a00:4c16:b0:56d:2634:c28e with SMTP id ea22-20020a056a004c1600b0056d2634c28emr46616714pfb.8.1667814340019; Mon, 07 Nov 2022 01:45:40 -0800 (PST) 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 i2-20020a170902c94200b00186dcc37e17sm4564936pla.210.2022.11.07.01.45.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 01:45:39 -0800 (PST) From: Sheng-Liang Pan To: LKML Cc: dianders@chromium.org, Sheng-Liang Pan , Konrad Dybcio , Andy Gross , Bjorn Andersson , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v11 3/5] arm64: dts: qcom: sc7280: Add touchscreen and touchpad support for evoker Date: Mon, 7 Nov 2022 17:43:43 +0800 Message-Id: <20221107173954.v11.3.I3ac715e729f6f9b5a3e3001b155df4f9d14e6186@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107094345.2838931-1-sheng-liang.pan@quanta.corp-partner.google.com> References: <20221107094345.2838931-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 Reviewed-by: Konrad Dybcio --- 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 Mon Nov 7 09:43:44 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: 13034217 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 E2554C43217 for ; Mon, 7 Nov 2022 09:45:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231840AbiKGJpx (ORCPT ); Mon, 7 Nov 2022 04:45:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231848AbiKGJpw (ORCPT ); Mon, 7 Nov 2022 04:45:52 -0500 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 405461759E for ; Mon, 7 Nov 2022 01:45:50 -0800 (PST) Received: by mail-pl1-x62d.google.com with SMTP id io19so10557262plb.8 for ; Mon, 07 Nov 2022 01:45:50 -0800 (PST) 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=49aUWgohg7elYN6AoCe1Cce7ryH+ByqM4waHSXDXpfM=; b=lylI29n0B1HjCiFjLpUc2mG6M3ulW1IeVI0WuYFSQBYaIxSSTIYGqLqNJZIlonG7ZU L430D/+9nmgeSI/BDOYoMDpIZClVklgG1JlronVwp5mn1xUTECWdVvZq5mi9HCni32u0 Eit36ZKgu1t3M5db8N9lkah0sdViZGlUSniMLMZyd7jDWqxLbyAEQjgIE6kbr29wMYA1 x4idOZ0X7CjypKm7kY7lHzsmI8fjusbhKq0xbR0QZZhpYhka+Diprcy33u9IZdPZF2fA w67Ua1BHYB129r0AW0/j+rIUNJXWwPGdKIVLAY3BYvWK2doPC8wL7FmJSaulUHrKZamw piRQ== 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=49aUWgohg7elYN6AoCe1Cce7ryH+ByqM4waHSXDXpfM=; b=dtDjjm1WtohMwubwSFWGBapu/vvK4AhxwDx74TCiHz0Hvwh5T8kkVq7ZjQpa0XXV14 RA4wS3ZGIX7mLde165PeSEfP43hAv4D1SeFnDN50gHpwmpp8D0HzXgVXRYxSFTs5IN/V b7HoV1pE37j6CORsipyvbvH3VH17FEpg1eellyGBoE83mna1lCnpq1L3TzWtQgE58u0t RYPM+QvpSaOTB39kibGcsx4F4IKF4+6Kj/+vcDGqm8NhyBmNL0uHhhx6vKJyp1CY84FK xo7b+ozYHgie7b8t9mIHr+aHbfeQUSoQDR/FYPsnd2vnImk+AQ4ZnRCn9SSTvZKHIGK8 EP6Q== X-Gm-Message-State: ACrzQf2XVYKAirtNnWRc0dZ4PKz1JZ90SvVdFlRKu7jAlLxBKaOIkaD/ 8hqtAKtUevRkRC7aY1QuI0qVeg== X-Google-Smtp-Source: AMsMyM4J4i/WOC1a9+YRm9o8z5D+8EewAZa3pnC7BgO/cwvGzzVPIDVK3c2z96/KAWWdNSB5hJZPJg== X-Received: by 2002:a17:90a:4b05:b0:213:ead5:92ee with SMTP id g5-20020a17090a4b0500b00213ead592eemr39488812pjh.117.1667814349661; Mon, 07 Nov 2022 01:45:49 -0800 (PST) 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 i2-20020a170902c94200b00186dcc37e17sm4564936pla.210.2022.11.07.01.45.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 01:45:49 -0800 (PST) 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 v11 4/5] arm64: dts: qcom: sc7280: add sc7280-herobrine-audio-rt5682-3mic3.dtsi for evoker Date: Mon, 7 Nov 2022 17:43:44 +0800 Message-Id: <20221107173954.v11.4.I9718ac3622fa550e432209ae5c95c87b873a0f87@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107094345.2838931-1-sheng-liang.pan@quanta.corp-partner.google.com> References: <20221107094345.2838931-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 Reviewed-by: Konrad Dybcio Reviewed-by: Douglas Anderson --- Changes in v11: - sort out the "Status" property with sc7280-herobrine-audio-rt5682-3mic.dtsi Changes in v10: - add evoker include specific sc7280-herobrine-audio-rt5682-3mic.dtsi setting .../sc7280-herobrine-audio-rt5682-3mic.dtsi | 195 ++++++++++++++++++ .../boot/dts/qcom/sc7280-herobrine-evoker.dts | 1 + 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..cf34334451d6b --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi @@ -0,0 +1,195 @@ +// 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"; + + 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 { + clock-frequency = <400000>; + status = "okay"; + + 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 { + 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>; + + status = "okay"; + + 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 { + vdd-micb-supply = <&pp1800_l2c>; + pinctrl-0 = <&lpass_dmic01_clk>, <&lpass_dmic01_data>, <&lpass_dmic23_clk>, + <&lpass_dmic23_data>; + + status = "okay"; +}; + +/* PINCTRL - ADDITIONS TO NODES IN PARENT DEVICE TREE FILES */ + +&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; +}; + +&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; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts index dcdd4eecfe670..51f0401b11ed7 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts @@ -8,6 +8,7 @@ /dts-v1/; #include "sc7280-herobrine-evoker.dtsi" +#include "sc7280-herobrine-audio-rt5682-3mic.dtsi" / { model = "Google Evoker"; From patchwork Mon Nov 7 09:43:45 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: 13034218 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 F0AE5C433FE for ; Mon, 7 Nov 2022 09:46:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231618AbiKGJqd (ORCPT ); Mon, 7 Nov 2022 04:46:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231881AbiKGJqb (ORCPT ); Mon, 7 Nov 2022 04:46:31 -0500 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5795B18374 for ; Mon, 7 Nov 2022 01:46:28 -0800 (PST) Received: by mail-pj1-x102d.google.com with SMTP id v4-20020a17090a088400b00212cb0ed97eso9761989pjc.5 for ; Mon, 07 Nov 2022 01:46:28 -0800 (PST) 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=roGc4+qz6FYoa6IVuyPxJOvm0gSmGM4+cpEPDr2Izhk=; b=QgiK9dLeRRmJfnLqrlHoI83I4QQexT5FQvf85mP8tTluXwWT3nllG8dMRpqN5OWnU8 b6sb9ZU+nPJOBO09F4beDhq2KRxgIKPh0LlCyXxzXr3dE/99y5cV26y/s6cstjdBqPL6 OigpcHHQDcAVpB0HtAtL9FhJ9ZF6GpPnBjynuXi9CX3JXPlpe8LlI8DP9IdupHoFrAhW BZWnue4a7T7OVQDmUj7szd4fAts9pmfjJgHlgblr1Je8SPmBqoykjqxhJ3o8ACCOxT3v M2aY6gwQowpHV0N0V2XBO2b7c2cbRwFbFBIUeJgcdF2KXZUG/S/SSSWdpnzne683H7ib uQFQ== 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=roGc4+qz6FYoa6IVuyPxJOvm0gSmGM4+cpEPDr2Izhk=; b=UzRTDQNQe5InoVl8vNgkhxZTaCsbqr0tGuDeLv3Bf0vVJ/jGP2H+SiukPVGc+9wUU8 XlbvEE9Blk5M4nP3T4MEgEsuaLDa4Hkdat0pBXmDtx6k+ZEtGosXediYg79SA71fRkMk oTGH5zdA4yaK4hZp9DOftU0iHuy3uxXo6vAprJNUJIZZ3wsKXwkgxgxGsjvLkguLcoTR 08j+X4N6xrO+gMDRAVLKn0c8nbHJx2+POOWcgBLjRtf8/M1q1Xc93rSiCcwFiA8o3KWL +lad2LUIGUEatVAB4Q/qtW8dFRLkVCIqvWqeUds+WZW2sloPBJgSG/TljIoFlXhI/U8W 6eyw== X-Gm-Message-State: ANoB5pliGVRzDPgBV/qOjoD08Z/nLeHPAYP6+L6++pA4uQP23GokPGtV KP3emIeT3uWDLALrSE6mPgOjFw== X-Google-Smtp-Source: AA0mqf7D+7PfKldkBkiX1jwGwvnkkBhb0OkyzgetNWSKblW2yySKx/z7s+SMT6aF+IT0XEUou5OicA== X-Received: by 2002:a17:902:cf07:b0:188:7e83:c5f1 with SMTP id i7-20020a170902cf0700b001887e83c5f1mr5593993plg.58.1667814387820; Mon, 07 Nov 2022 01:46:27 -0800 (PST) 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 i2-20020a170902c94200b00186dcc37e17sm4564936pla.210.2022.11.07.01.46.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 01:46:27 -0800 (PST) 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 v11 5/5] arm64: dts: qcom: sc7280: sort out the "Status" to last property with sc7280-herobrine-audio-rt5682.dtsi Date: Mon, 7 Nov 2022 17:43:45 +0800 Message-Id: <20221107173954.v11.5.I4c6d97e6f3cf8cdc691d2d4519883c3018dd4372@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107094345.2838931-1-sheng-liang.pan@quanta.corp-partner.google.com> References: <20221107094345.2838931-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 To keep diffs clean, sort out "Status" to last property. Signed-off-by: Sheng-Liang Pan Reviewed-by: Konrad Dybcio Reviewed-by: Douglas Anderson --- Changes in v11: - sort out the "Status" property with sc7280-herobrine-audio-rt5682.dtsi .../dts/qcom/sc7280-herobrine-audio-rt5682.dtsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi index 2dbdeeb29ecec..fc7a659dfe4ae 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi @@ -13,14 +13,14 @@ sound: sound { compatible = "google,sc7280-herobrine"; model = "sc7280-rt5682-max98360a-1mic"; - status = "okay"; - audio-routing = - "Headphone Jack", "HPOL", - "Headphone Jack", "HPOR"; + audio-routing = "Headphone Jack", "HPOL", + "Headphone Jack", "HPOR"; #address-cells = <1>; #size-cells = <0>; + status = "okay"; + dai-link@0 { link-name = "MAX98360"; reg = <0>; @@ -50,8 +50,8 @@ codec { }; hp_i2c: &i2c2 { - status = "okay"; clock-frequency = <400000>; + status = "okay"; alc5682: codec@1a { compatible = "realtek,rt5682s"; @@ -75,8 +75,6 @@ alc5682: codec@1a { }; &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>; @@ -84,6 +82,8 @@ &lpass_cpu { #address-cells = <1>; #size-cells = <0>; + status = "okay"; + dai-link@0 { reg = ; qcom,playback-sd-lines = <1>;