From patchwork Mon Oct 31 10:20:08 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: 620497 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 DFA50FA3740 for ; Mon, 31 Oct 2022 10:20:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230259AbiJaKUW (ORCPT ); Mon, 31 Oct 2022 06:20:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230337AbiJaKUV (ORCPT ); Mon, 31 Oct 2022 06:20:21 -0400 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3565DF2C for ; Mon, 31 Oct 2022 03:20:19 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id 3-20020a17090a0f8300b00212d5cd4e5eso15449244pjz.4 for ; Mon, 31 Oct 2022 03:20:19 -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=y0NzHzL9+OqKycduRshIlouA9QYZcOsz78KLUVB0CECSss941UQsjs8jYeHg+jBNGP PWO2b+loghQvOah73gMdje/LWDkXEWpr9M1rXWomtkWx51YsZqUkgnSQoa6oK9113Eww cmgLdH8v8m5FFwoVQwukBbWy9KEL9qhGLPJO+DKAmaC2tb9ug++BRY7Sgl9hij0AB5+8 ONBJlOMiGrJ/FwokLw1n6tQiGHKPKDT7Yub02JqoFGcrQDR4ysCnGO1ldTOo0irTrmU+ jymJMLoswP0lbBHHImhZbZimvf62GvfJJURWKLCPr8VOhHV4x9AkT15V6SGK7evScRF3 mScg== 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=tTOFBPnUW88bGkbo+Quzv4yQRI8fhDDO5b9b7aj9X9wRa4Fgt8oSTV53AajMmE7/Y2 8T73DLaEIHefMiRZtcHrPw+giW9u81uBVqMott4GFFdnJDCNiGtJGRutnpFRLKnfe2F8 d6t/+IL/dDdfSf6BSMgEnyYdj4IGAN8jqWek0EUGbpaE+JET4lPBhDH2rlTJKTj8jEPD eGvQTyFc85I+/UQnk0t0UkrmptHNHzBGofqciscokEjnTCh3L4L2T8aIL2doqSFa+YdA qebAPO4tppIup4bmT7qDsj4XOzLumDGYHnf1HMU6RD92TGtEMIw97/rq+/w24HHF9WTW Mtyg== X-Gm-Message-State: ACrzQf1gMD7HXKK448KxWj0kLY8qWgtgfvlkApHJA5y6CFJeuEiTh7X5 NWJZEXnAeKCaG0A21izzu7Wdpw== X-Google-Smtp-Source: AMsMyM6zRx4W8DirlVQgBINnxDF8OsjxcShDvVrtOxeI9ew90VXn0xCXf/lc4+jWsKU4n6DoPhRTaQ== X-Received: by 2002:a17:903:183:b0:184:8c1a:7a95 with SMTP id z3-20020a170903018300b001848c1a7a95mr13578100plg.137.1667211619371; Mon, 31 Oct 2022 03:20:19 -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 k12-20020a170902c40c00b00186881e1feasm4136551plk.112.2022.10.31.03.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 03:20:19 -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 v9 1/4] dt-bindings: arm: qcom: Separate LTE/WIFI SKU for sc7280-evoker Date: Mon, 31 Oct 2022 18:20:08 +0800 Message-Id: <20221031181735.v9.1.Ic800ee7b604bcb0519ca404600d7be2352725686@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031102011.136945-1-sheng-liang.pan@quanta.corp-partner.google.com> References: <20221031102011.136945-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 Oct 31 10:20:09 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: 620287 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 C9EEFC38A02 for ; Mon, 31 Oct 2022 10:20:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230416AbiJaKU3 (ORCPT ); Mon, 31 Oct 2022 06:20:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230337AbiJaKUX (ORCPT ); Mon, 31 Oct 2022 06:20:23 -0400 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3EACDF39 for ; Mon, 31 Oct 2022 03:20:22 -0700 (PDT) Received: by mail-pg1-x52e.google.com with SMTP id h2so10305047pgp.4 for ; Mon, 31 Oct 2022 03:20:22 -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=FEhtQ4lt1vwQd7b29HOAdNLE/xqfiMzxBVTYUImdOnQf+8s/8nBmGslxBwpRge5CxS 4218BwLx4XmTeeBUwyLuHd1MmpWyuaXdeZ5uUS+GJkqgaOt35IarjplHYWcTyA6PYpaY UyOTwiWIPw2YtZIU8wvnRnjconjNusS5Ree8gTDTShmBa8zvCnpRn5vl+an/41L2dhNz jOGDsV+SyvlAeAFwgQCvsWHhy8QquoyrnYQGJjncSxD47kK19gIrPmumyB0EqrdkMNa0 AepqANRNCl5Kt+OTwE0qU2yIJUwwFdEIZdzAVK+UMGEKfDNb8d7ovXLgv57C4/qobWW5 1kag== 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=V8hJ1uJjgsLEoGlfDe0WW/M5RDLBuWzzXlYpM4pJR2zj3eySg8nwOwfhbjXTPAXJfw w4LDu2aLsdVvlIxbOsBuSrTT7H3Q1Kc4VdiDGXNRwg5Rwj43olidsElPMQyvrgdJ+Joo kwj4QLKyuHL2zAXGRs3cCX/TR9QxqBPhjv3wCuqXgVXf/Nmv2iP7MVco3Bj/jP8QxiPw I2Wu+8CHIAUJ0J/WLH9f5VsXq1fVPRaTKG+EBXTsk5zUoO0r7hzzgDfq9jiIq2Bfb1Sc 4ywQEZYBN2Ac2LW/CVYus4ODvZevNelSWfJ9zFDgsfLRzkqKYj0Ny/xI2o7yfGVapFyy pGZg== X-Gm-Message-State: ACrzQf1ITxrhN/I2rvVmHltV15ANqvfN0BU0vnOeI8K/MOC77TN83QCk CY6YShXqRf89oZv91EJzGBUFSg== X-Google-Smtp-Source: AMsMyM6VJK3H8BWfRIIaUk380Srg6bIt31RIvUZ/XS7aYMbCHMLUHeL8rxZgco9gW0VGWAcwBLOByA== X-Received: by 2002:a63:6b09:0:b0:453:b1f8:bb3b with SMTP id g9-20020a636b09000000b00453b1f8bb3bmr12434312pgc.36.1667211622187; Mon, 31 Oct 2022 03:20:22 -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 k12-20020a170902c40c00b00186881e1feasm4136551plk.112.2022.10.31.03.20.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 03:20:21 -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 v9 2/4] arm64: dts: qcom: sc7280: Add LTE SKU for sc7280-evoker family Date: Mon, 31 Oct 2022 18:20:09 +0800 Message-Id: <20221031181735.v9.2.If03e9e85e63ece4b1599db841c90ed785c47a4be@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031102011.136945-1-sheng-liang.pan@quanta.corp-partner.google.com> References: <20221031102011.136945-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 Mon Oct 31 10:20:10 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: 620496 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 80AB9FA3742 for ; Mon, 31 Oct 2022 10:20:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229716AbiJaKUa (ORCPT ); Mon, 31 Oct 2022 06:20:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230402AbiJaKU2 (ORCPT ); Mon, 31 Oct 2022 06:20:28 -0400 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56BFEDF74 for ; Mon, 31 Oct 2022 03:20:25 -0700 (PDT) Received: by mail-pf1-x432.google.com with SMTP id b29so10247760pfp.13 for ; Mon, 31 Oct 2022 03:20:25 -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=gi/sUzzWHCD4PNXPKoUxF/DaaOBdsTRMWS/NBfPhZ6M5UbHzP3anRNIkkbFMZTiEP9 Qeea98izXUorD/O5RtuI4I8TWF7Vu1nIR0iItqeUqPFJXbcuIwuQ5nTRIuo0iDeVOoKh 09OXVTYj59D+pxrEgrXjcVrkE/hPe2W606KRtyLb1zcCd1bMj0QKP+uqiOcWO3XnQpwT XGTSz0FFl+C8W5TaEgP44AMiWKhpHz3Ex1bGY6w0AmE0L37yw1UJrwkERsWs1yRif+iu mBLfWaRDrw1/XNZfLyQGutR3HU/PePdolSF7W/O2uN64LUVLUvKkUYm4FA7ADYTIeUtl zkiA== 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=W/vVA9xYup5VFH1apPo9XFAuBf1r7SckViz48eBowTs2bHPZoIIt3pHsy7cBYt7jvy 7axnq3h0N5GRuDOtFet66PrTZUZSGcsH5FbOtdbRzqG0/Mv6FoYQxim3tuFrA21xScmg rBpUfZ12YYP8brzFbtCVAT5E7gHo9S9Owcf3X0EfgGPdk6BeTxZXMUftjzol/Ut3PLo/ K923r325m20BDL6Q3vPYWHUtqRr2y6dxjOMJb0gTg85swoHxdY1AbNLKv5lM9CY2kqgH OQ8RCIyGqOCE2DN/9pF85oteYElTM8zw1Yb5hjuAb3wpFjLimdzoAjDomabHwbY8eMTW 2LaQ== X-Gm-Message-State: ACrzQf3HDiDrbe2dsU6A8sgD81riaqHI7ZIbwMhYB7c7tEpS1KzSjMG0 YnrL/+fT3OETJfB5L7lV4NX+aA== X-Google-Smtp-Source: AMsMyM4rGuKmmC+fs75OTTZnszCQbalPEiLdoDfUxCI4DQ+NdieCXtLOxRP1fgztnlzroClQJuDoYw== X-Received: by 2002:a63:234c:0:b0:46f:1b7:438b with SMTP id u12-20020a63234c000000b0046f01b7438bmr11977538pgm.516.1667211624985; Mon, 31 Oct 2022 03:20:24 -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 k12-20020a170902c40c00b00186881e1feasm4136551plk.112.2022.10.31.03.20.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 03:20:24 -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 v9 3/4] arm64: dts: qcom: sc7280: Add touchscreen and touchpad support for evoker Date: Mon, 31 Oct 2022 18:20:10 +0800 Message-Id: <20221031181735.v9.3.I3ac715e729f6f9b5a3e3001b155df4f9d14e6186@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031102011.136945-1-sheng-liang.pan@quanta.corp-partner.google.com> References: <20221031102011.136945-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 Mon Oct 31 10:20:11 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: 620286 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 1929DC38A02 for ; Mon, 31 Oct 2022 10:20:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230457AbiJaKUd (ORCPT ); Mon, 31 Oct 2022 06:20:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230425AbiJaKUa (ORCPT ); Mon, 31 Oct 2022 06:20:30 -0400 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50003DF8D for ; Mon, 31 Oct 2022 03:20:28 -0700 (PDT) Received: by mail-pf1-x432.google.com with SMTP id m6so10325964pfb.0 for ; Mon, 31 Oct 2022 03:20:28 -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=7bmZ2pYb9pdBaYbjBzroXAssfgCgw6icpxdo/Msq598=; b=489qbVO3Y2VoocLP1TrfwItNxUM/uq7K/xmZKibkahS1fi9D4xZTok3cGEYXN1bkW2 WmqrlfmuObNEJ5xMCUNjFAamXBgV/wwgFA4Ah5LGzXw7P5+LPTIuaQqEp7mg3M1kITNE zdvLiP3y2dtFgh3OptkHFhxW/I/OwZ0r9lwdgIiJ92j5oFuLuIafcjyINqoAXHKvq/T5 uvzitOKX9KXuyGSmAhqoGz6gMyDj2aA06cWd6tlijMIRqSt37NjyoOIv5XeUvnjyaCdS MFPIV876LNG/ClU8sX87iQ+h0vd4k7zz1DiS+ezEauZwAvO0sNq5HEypVSeAaMLKr6Ej NSzg== 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=7bmZ2pYb9pdBaYbjBzroXAssfgCgw6icpxdo/Msq598=; b=emeSc7IzOFCAeDfS6uANojJncLI7o8i1vJi3RHvMsNugPpYmbqlwo+KExozJgerTkv 2Pd6rvRSkTzBDPfbrPrEO9Mmgfxa5698G/suzHiRdLb7l7iI+GKP3xQgBQ5pfSy/q90P RVltD2CumIOTUtjx+8ZTW2i2Vh+FTomtUWUMa+CT/TEYgDerHfbmmiWh2mzbFEqQSnAq xy6yrMv58F4YH8t9VGxRPC+MGeATiFkwgauJgl1y9iesFOcItDsHHQ46VcPcknmF03do ftEK48cko8dlj94tTnAURjFDoWR7QAT2BNh6oI+QJZQxjo2R6sK/ZHQ4Mq2n6USUlUzo 3FvA== X-Gm-Message-State: ACrzQf0t70eHmhjcYUcEIWueRWYOFZxKdDV0e1zwjnKEjF0VNucP1CKK la3kg8iy70+2oOy2enYX2mIkfw== X-Google-Smtp-Source: AMsMyM7cOIuxRw7X4Cf4VCu1A3GaarZ06GwstTdKd5q1ohCrn8RGhFuB+zPQ0SP4+/adehH08yxnqw== X-Received: by 2002:a63:1612:0:b0:461:4180:d88b with SMTP id w18-20020a631612000000b004614180d88bmr12301738pgl.434.1667211627801; Mon, 31 Oct 2022 03:20:27 -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 k12-20020a170902c40c00b00186881e1feasm4136551plk.112.2022.10.31.03.20.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 03:20:27 -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 v9 4/4] arm64: dts: qcom: sc7280: include sc7280-herobrine-audio-rt5682.dtsi in evoker Date: Mon, 31 Oct 2022 18:20:11 +0800 Message-Id: <20221031181735.v9.4.I9718ac3622fa550e432209ae5c95c87b873a0f87@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031102011.136945-1-sheng-liang.pan@quanta.corp-partner.google.com> References: <20221031102011.136945-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 Include sc7280-herobrine-audio-rt5682.dtsi in evoker as it uses rt5682 codec. Signed-off-by: Sheng-Liang Pan --- Changes in v9: - new patch for evoker include rt5682.dtsi .../boot/dts/qcom/sc7280-herobrine-evoker.dts | 132 ++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts index dcdd4eecfe670..d54c07ff35f4f 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts @@ -8,8 +8,140 @@ /dts-v1/; #include "sc7280-herobrine-evoker.dtsi" +#include "sc7280-herobrine-audio-rt5682.dtsi" + / { model = "Google Evoker"; compatible = "google,evoker", "qcom,sc7280"; }; + +&sound { + 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 = <1>; + + 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>; + }; + }; +}; + +&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 */ + +&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; +};