From patchwork Mon Mar 1 21:34:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 12110639 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7EB9AC433DB for ; Mon, 1 Mar 2021 21:40:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2AFC960232 for ; Mon, 1 Mar 2021 21:40:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238663AbhCAVjv (ORCPT ); Mon, 1 Mar 2021 16:39:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243998AbhCAVho (ORCPT ); Mon, 1 Mar 2021 16:37:44 -0500 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29275C061794 for ; Mon, 1 Mar 2021 13:34:47 -0800 (PST) Received: by mail-pj1-x102a.google.com with SMTP id o6so454704pjf.5 for ; Mon, 01 Mar 2021 13:34:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pTOv9sgY3m/KoKSOcbv0Bygw57sq0LMY7JaKuvUzw1g=; b=nYv3VRDNkGZXK5ea9gR23Z5jWgv6Lj/Zlr4fdaSH04Zm0BooAE+awETGxX3X2T9r4j M0Joya0HN7cUyYMCOSSZKZO9UefdS48Z0tJC+q7QSjF2CpUYqvV3AnNkcgfX1JWmoO7w rj5I3rKfm74eIdafBhMFS9DPH1GL5tu0/XNBk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pTOv9sgY3m/KoKSOcbv0Bygw57sq0LMY7JaKuvUzw1g=; b=ZM/WduEsfkEoQvwKKEUYPxaokvC1VJyo1uKr5cHKqMzPMn/OUyhn2OmKi7Amc4aQhp m6MppL8LXrxIsYDAGYvuSU63Vi1/BjqWim1L6oSvE9X9RDfi0qKv4WMdretvzuxnlxad daE9D3N1Mqx1jAxO5YE3hsQCEOvhfguWWwTMrZT+1Fc/N7es8zPVnmNVQ5I+GBVAp7B4 mjfGI/hkm1eT3AdFObstJ+KLw3BSW84sD9zEuDNj630hvAXTEjxcIRTGnwrEgzvPtjoD jiPCjErkuwN5vlCG99ecnjyOkGcKYYX+RIWfRIc6ArckOWhKZQXpH65pxK0d05i6mUcJ 20PA== X-Gm-Message-State: AOAM531qYqwRagPoPp84xsTghQ49G+pMkH4iCJfg84hx25/kRg9nkCMV gC0vkpAwdY98EHBvQH6DE42/8Q== X-Google-Smtp-Source: ABdhPJwpEdlrDXWdSs1Pog6HtyBnejPjZCIjacqPdNTpq7m1VAyri/jlZZk0QGtlC0xYOS2Bs0zdkQ== X-Received: by 2002:a17:90a:16d6:: with SMTP id y22mr908810pje.55.1614634486738; Mon, 01 Mar 2021 13:34:46 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c086:5f6:85dd:98c8]) by smtp.gmail.com with ESMTPSA id f13sm790366pjj.1.2021.03.01.13.34.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 13:34:46 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Rob Clark , Alexandru M Stan , Stephen Boyd , Matthias Kaehlcke , Jeykumar Sankaran , Chandan Uddaraju , Vara Reddy , Tanmay Shah , Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 01/13] arm64: dts: qcom: sc7180: Update dts for DP phy inside QMP phy Date: Mon, 1 Mar 2021 13:34:25 -0800 Message-Id: <20210301133318.v2.1.Iad06142ceb8426ce5492737bf3d9162ed0dd2b55@changeid> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210301213437.4165775-1-dianders@chromium.org> References: <20210301213437.4165775-1-dianders@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Stephen Boyd Drop the old node and add the new one in its place. Cc: Stephen Boyd Cc: Jeykumar Sankaran Cc: Chandan Uddaraju Cc: Vara Reddy Cc: Tanmay Shah Cc: Rob Clark Signed-off-by: Stephen Boyd [dianders: Adjusted due to DP not itself not in upstream dts yet] Signed-off-by: Douglas Anderson --- (no changes since v1) arch/arm64/boot/dts/qcom/sc7180.dtsi | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 1ea3344ab62c..60248a6757d8 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -2770,12 +2770,11 @@ usb_1_hsphy: phy@88e3000 { }; usb_1_qmpphy: phy-wrapper@88e9000 { - compatible = "qcom,sc7180-qmp-usb3-phy"; + compatible = "qcom,sc7180-qmp-usb3-dp-phy"; reg = <0 0x088e9000 0 0x18c>, - <0 0x088e8000 0 0x38>; - reg-names = "reg-base", "dp_com"; + <0 0x088e8000 0 0x38>, + <0 0x088ea000 0 0x40>; status = "disabled"; - #clock-cells = <1>; #address-cells = <2>; #size-cells = <2>; ranges; @@ -2790,7 +2789,7 @@ usb_1_qmpphy: phy-wrapper@88e9000 { <&gcc GCC_USB3_DP_PHY_PRIM_BCR>; reset-names = "phy", "common"; - usb_1_ssphy: phy@88e9200 { + usb_1_ssphy: usb3-phy@88e9200 { reg = <0 0x088e9200 0 0x128>, <0 0x088e9400 0 0x200>, <0 0x088e9c00 0 0x218>, @@ -2803,6 +2802,16 @@ usb_1_ssphy: phy@88e9200 { clock-names = "pipe0"; clock-output-names = "usb3_phy_pipe_clk_src"; }; + + dp_phy: dp-phy@88ea200 { + reg = <0 0x088ea200 0 0x200>, + <0 0x088ea400 0 0x200>, + <0 0x088eaa00 0 0x200>, + <0 0x088ea600 0 0x200>, + <0 0x088ea800 0 0x200>; + #clock-cells = <1>; + #phy-cells = <0>; + }; }; dc_noc: interconnect@9160000 { @@ -3166,8 +3175,8 @@ dispcc: clock-controller@af00000 { <&gcc GCC_DISP_GPLL0_CLK_SRC>, <&dsi_phy 0>, <&dsi_phy 1>, - <0>, - <0>; + <&dp_phy 0>, + <&dp_phy 1>; clock-names = "bi_tcxo", "gcc_disp_gpll0_clk_src", "dsi0_phy_pll_out_byteclk", From patchwork Mon Mar 1 21:34:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 12110643 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D01DC433E6 for ; Mon, 1 Mar 2021 21:40:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3D19A60233 for ; Mon, 1 Mar 2021 21:40:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242030AbhCAVkb (ORCPT ); Mon, 1 Mar 2021 16:40:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244207AbhCAViL (ORCPT ); Mon, 1 Mar 2021 16:38:11 -0500 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED81BC061797 for ; Mon, 1 Mar 2021 13:34:48 -0800 (PST) Received: by mail-pf1-x429.google.com with SMTP id o188so5744385pfg.2 for ; Mon, 01 Mar 2021 13:34:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VyeZQvl4byLd25Jz1AxZVLku+5m4TK8ZxtD8FgoDo9M=; b=YXldF7i0YZ8gaspXB/kpxJp5CMVxf+v8a8cvMgQ9uRJIGfXB0EZehtPLCj1onqsD8U 8rrkRPYFjhwsxXNk5tPyFxiX9ZoNUC+4FK/YG9Lp7YSB5KGBVdi9VqW3bZqfPPQJUoMQ pyG6JnCyg8xc0cC4klhlcdphhonYu9HPTqhIU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VyeZQvl4byLd25Jz1AxZVLku+5m4TK8ZxtD8FgoDo9M=; b=CTpvUgT8thK2f50u++S0opiGvtoXgR8UL6mhRLktN4CsF2XSGn38wraJ0QykLIdCnC Z3EldaxuedpRcRdA9JxhSKqLEruVq/n/cDG19Qq7I6Zj6sfrh2YO/IWZQEGCYkvW50Fa QTvQ1nT5JO5LAFxLeDHUcd3TT1fQ+TEII/zmMv+i0fO9LLnemYcy1Y0G71/mst0haLLg uf11iY9vSDE1wtaii3etypJfs2qV2CEeXH3S7FkCdb66k2HSso9bCXhYVw4loHMnn3K/ ZZD6DuFctJbq24rVd+kqnhCN2o06fSTPL5aM+QCzk3ZtuBa6BXKo/Wp6YAp8LJrUqZw0 aJSA== X-Gm-Message-State: AOAM530EWCE09jDnO8OfXa6WPqC/qkBAsayN4iwrRdnfjdUI42kEOuuM j92fL1W7khV2eRuUeHid4dFfbw== X-Google-Smtp-Source: ABdhPJz3MOi2pUgM5t3J6movoTcpC9yZ0+DXCKH3b7olTFUP73JuUeF5EcfDuNShqtp+IWeJTQQxNA== X-Received: by 2002:a62:4c1:0:b029:1ee:70e1:75c1 with SMTP id 184-20020a6204c10000b02901ee70e175c1mr368583pfe.23.1614634488544; Mon, 01 Mar 2021 13:34:48 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c086:5f6:85dd:98c8]) by smtp.gmail.com with ESMTPSA id f13sm790366pjj.1.2021.03.01.13.34.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 13:34:48 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Rob Clark , Alexandru M Stan , Stephen Boyd , Matthias Kaehlcke , Douglas Anderson , V Sujith Kumar Reddy , Srinivasa Rao Mandadapu , Tzung-Bi Shih , Judy Hsiao , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 02/13] arm64: dts: qcom: Move sc7180 MI2S config to board files and make pulldown Date: Mon, 1 Mar 2021 13:34:26 -0800 Message-Id: <20210301133318.v2.2.Id27e7e6f90c29bf623fa4880e18a14ba1dffd2d2@changeid> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210301213437.4165775-1-dianders@chromium.org> References: <20210301213437.4165775-1-dianders@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org In general pinconf belongs in board files, not SoC files. Move it to the only current user (trogdor). Also adjust the drive strengths and pulls. Cc: V Sujith Kumar Reddy Cc: Srinivasa Rao Mandadapu Cc: Tzung-Bi Shih Cc: Judy Hsiao Signed-off-by: Douglas Anderson Reviewed-by: Matthias Kaehlcke Reviewed-by: Stephen Boyd --- This should replace the patch ("Asoc: qcom: dts: Change MI2S GPIO configuration to pulldown") [1]. It can also be noted that on future SoCs we won't have the separate pinconf/pinmux nodes but we're not there yet on sc7180 [2]. [1] https://lore.kernel.org/r/1605526408-15671-1-git-send-email-srivasam@codeaurora.org [2] https://lore.kernel.org/r/CAD=FV=WhjvqUau_Jz9ZLFukGUxRqGJTJN+sUt=yv2Q81FRzUWQ@mail.gmail.com (no changes since v1) arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 24 ++++++++++++++++++++ arch/arm64/boot/dts/qcom/sc7180.dtsi | 18 --------------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index 58e127b6ba1e..47eed134c733 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -877,6 +877,22 @@ pinconf { }; }; +&pri_mi2s_active { + pinconf { + pins = "gpio53", "gpio54", "gpio55", "gpio56"; + drive-strength = <2>; + bias-pull-down; + }; +}; + +&pri_mi2s_mclk_active { + pinconf { + pins = "gpio57"; + drive-strength = <2>; + bias-pull-down; + }; +}; + &qspi_cs0 { pinconf { pins = "gpio68"; @@ -1017,6 +1033,14 @@ pinconf-rx { }; }; +&sec_mi2s_active { + pinconf { + pins = "gpio49", "gpio50", "gpio51"; + drive-strength = <2>; + bias-pull-down; + }; +}; + /* PINCTRL - board-specific pinctrl */ &pm6150_gpio { diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 60248a6757d8..5040923a9f7c 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -1856,12 +1856,6 @@ pinmux { pins = "gpio49", "gpio50", "gpio51"; function = "mi2s_1"; }; - - pinconf { - pins = "gpio49", "gpio50", "gpio51"; - drive-strength = <8>; - bias-pull-up; - }; }; pri_mi2s_active: pri-mi2s-active { @@ -1869,12 +1863,6 @@ pinmux { pins = "gpio53", "gpio54", "gpio55", "gpio56"; function = "mi2s_0"; }; - - pinconf { - pins = "gpio53", "gpio54", "gpio55", "gpio56"; - drive-strength = <8>; - bias-pull-up; - }; }; pri_mi2s_mclk_active: pri-mi2s-mclk-active { @@ -1882,12 +1870,6 @@ pinmux { pins = "gpio57"; function = "lpass_ext"; }; - - pinconf { - pins = "gpio57"; - drive-strength = <8>; - bias-pull-up; - }; }; sdc1_on: sdc1-on { From patchwork Mon Mar 1 21:34:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 12110641 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2307EC433DB for ; Mon, 1 Mar 2021 21:40:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DE29C600CC for ; Mon, 1 Mar 2021 21:40:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241296AbhCAVkW (ORCPT ); Mon, 1 Mar 2021 16:40:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244198AbhCAViL (ORCPT ); Mon, 1 Mar 2021 16:38:11 -0500 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58842C0617AA for ; Mon, 1 Mar 2021 13:34:50 -0800 (PST) Received: by mail-pf1-x42d.google.com with SMTP id q20so12400565pfu.8 for ; Mon, 01 Mar 2021 13:34:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9bA9mGQR2XV2Gj/ebrJ5SxBXvAk5v97N7zNdK3wCFp8=; b=WLxG2oFEc/OXWrJ5q2bugcDgJSWNAZ1XByY9zm7+5G7Ga8Ueu99EB/PpdW6b8DlwaS v/8dWE44NSmiY7iBMD5fQdz5jOwu6/0uasbvyvNEHTlrkpfrA8Q1Uc11/VSpiLRfrPeq DeicQyd8CPzwfOe2J1h0cGIKBtVQQhlwXk59A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9bA9mGQR2XV2Gj/ebrJ5SxBXvAk5v97N7zNdK3wCFp8=; b=gDIMNLoM/L+q8Yaao9/Hv9OXZ8m4YFNVf1BmikPI8bmsJ+dBpTcC7kHKvZqodGpWkO q91l3k1d1M3anxRVrG6+Ag6VIVQcj3n2UuTpEFF09DWyV7yK/K/UReP8xxT/7VX9ZHPm /ZxHjwIXZJVqPr1WFIRP6SudwW1Av0RkUcEIkojMa7AKeayZgXdl7pHhgetZx9oOw0NL XmoYfZceUEgAZCXAzI/VuLAikpCy7dSewcwCcdNSjk2+2QmqMQ1ZydtzxeNhfLHThBgt oO1uWJ9ht/lHzyoLpkiI9mBzNRfoIZi5RnikRArWbEDLi5nxJ9FcLVBw77GHHZB2oaec kYlQ== X-Gm-Message-State: AOAM533CSeOJz0KwN+37CG45GP031Oplduau3HBgX7JdNbVwsqx/r8o7 7lCQE9vJHLtOaFwJ70NW5Hdp8w== X-Google-Smtp-Source: ABdhPJzC7Eant4eIg87EAGIjnk4wlP3tmMPMyicEXXSBR3McIMNQbbVJPer/hPxvCAtzNgGEzfjlAQ== X-Received: by 2002:a62:77c7:0:b029:1ed:5afb:4dda with SMTP id s190-20020a6277c70000b02901ed5afb4ddamr16649580pfc.1.1614634489924; Mon, 01 Mar 2021 13:34:49 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c086:5f6:85dd:98c8]) by smtp.gmail.com with ESMTPSA id f13sm790366pjj.1.2021.03.01.13.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 13:34:49 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Rob Clark , Alexandru M Stan , Stephen Boyd , Matthias Kaehlcke , Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 03/13] arm64: dts: qcom: Prep sc7180-trogdor trackpad IRQ for new boards Date: Mon, 1 Mar 2021 13:34:27 -0800 Message-Id: <20210301133318.v2.3.Iddf6dc8102aa4fbc3847936226fc7bf2e2cd315c@changeid> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210301213437.4165775-1-dianders@chromium.org> References: <20210301213437.4165775-1-dianders@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The trackpad interrupt got renamed and also moved to a new GPIO on newer boards. Let's do the move in the "trogdor.dtsi" file and then undo it in the two old boards. NOTE: since none of the new boards have device trees yet, this change looks silly on its own but it will make sense after more boards are supported. Signed-off-by: Douglas Anderson Reviewed-by: Matthias Kaehlcke Reviewed-by: Stephen Boyd --- (no changes since v1) .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 14 ++++++++++++++ arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 16 ++++++++++++++++ arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 14 ++++++++------ 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index 89e5cd29ec09..11269522da50 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -58,8 +58,22 @@ ap_ts: touchscreen@10 { }; }; +&trackpad { + interrupts = <58 IRQ_TYPE_EDGE_FALLING>; +}; + /* PINCTRL - modifications to sc7180-trogdor.dtsi */ +&trackpad_int_1v8_odl { + pinmux { + pins = "gpio58"; + }; + + pinconf { + pins = "gpio58"; + }; +}; + &ts_reset_l { pinconf { /* This pin is not connected on -rev0, pull up to park. */ diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts index 2cb522d6962e..bd2c783e0f2f 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts @@ -68,6 +68,22 @@ &sdhc_2 { status = "okay"; }; +&trackpad { + interrupts = <58 IRQ_TYPE_EDGE_FALLING>; +}; + +/* PINCTRL - modifications to sc7180-trogdor.dtsi */ + +&trackpad_int_1v8_odl { + pinmux { + pins = "gpio58"; + }; + + pinconf { + pins = "gpio58"; + }; +}; + /* PINCTRL - board-specific pinctrl */ &tlmm { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index 47eed134c733..b471503e415e 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -644,14 +644,14 @@ ap_tp_i2c: &i2c7 { status = "okay"; clock-frequency = <400000>; - trackpad@15 { + trackpad: trackpad@15 { compatible = "elan,ekth3000"; reg = <0x15>; pinctrl-names = "default"; - pinctrl-0 = <&trackpad_int_1v8_odl>; + pinctrl-0 = <&tp_int_odl>; interrupt-parent = <&tlmm>; - interrupts = <58 IRQ_TYPE_EDGE_FALLING>; + interrupts = <0 IRQ_TYPE_EDGE_FALLING>; vcc-supply = <&pp3300_fp_tp>; @@ -1412,14 +1412,16 @@ pinconf-rx { }; }; - trackpad_int_1v8_odl: trackpad-int-1v8-odl { + /* Named trackpad_int_1v8_odl on earlier revision schematics */ + trackpad_int_1v8_odl: + tp_int_odl: tp-int-odl { pinmux { - pins = "gpio58"; + pins = "gpio0"; function = "gpio"; }; pinconf { - pins = "gpio58"; + pins = "gpio0"; /* Has external pullup */ bias-disable; From patchwork Mon Mar 1 21:34:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 12110653 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 114A3C433E0 for ; Mon, 1 Mar 2021 21:42:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D13496023C for ; Mon, 1 Mar 2021 21:42:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238560AbhCAVmN (ORCPT ); Mon, 1 Mar 2021 16:42:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237548AbhCAVkA (ORCPT ); Mon, 1 Mar 2021 16:40:00 -0500 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38A9DC06121F for ; Mon, 1 Mar 2021 13:34:52 -0800 (PST) Received: by mail-pf1-x431.google.com with SMTP id 201so12418048pfw.5 for ; Mon, 01 Mar 2021 13:34:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V0ebxcgXbfQv5hp4rfD6Yg7e3MPCcpWELcwXvbVKAmU=; b=eikxe/oZZvFtL4ioJ8o67Jzm07Sp/7RDF5NaQpn6TnvW4pudGJta+MHvB9Eh/nxPR3 eWf7xfACZYmDN01pf/H1n6pmSeHDkKcLRHKeXR0eVnl3xyTgQrkDG0vcc2lQCW7oHrhW /Qf/VzyhGIDMyxUMBCZT2FWqT4UVlYi5tLXHQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=V0ebxcgXbfQv5hp4rfD6Yg7e3MPCcpWELcwXvbVKAmU=; b=UJAx/Ov84fImzDbdcNRbaLinzhc1UObUkQPAcZZ64RYpKqVbCgdP6UvokWj8SvoOpZ lT69NFglg3mesuYnfyWzd10HXirQwUlkiZWRNWZADsWDgiLrmXiISPWcHn6xLIfYKHvz e4GOVVrrtDyME5P3wt4mEQcsPjRiuCalOS01gFk4E8qMcrHNG6AgtSFXj1aahzO9QVFH L/uedCvVXcf59/0JZeycMm8gQQo9BaM59eac27NoxKU+aAb0M5Vrt+uqQSDSJLg93dcb iDIl9w259Kww6EeEMqGQR92PqgfrA7x3vKoq7KYbXgE0+tukFBdpt1grNaEhOneBw8SA lunw== X-Gm-Message-State: AOAM532dALVkEUz3CNdDb8GK4vh/uaIAYqPkmLUhR0px1PTrqZebR8mR EL5r0epKh+kvkSd7tp2bqliolg== X-Google-Smtp-Source: ABdhPJxQAzkSFImr3H3hNeEOmB5bpk0C9a434SRfXl1AukyX37Q0h4TWQKBMN8iH9cefhl7wxfgJFQ== X-Received: by 2002:aa7:82cf:0:b029:1cc:5393:ad8e with SMTP id f15-20020aa782cf0000b02901cc5393ad8emr16984349pfn.3.1614634491803; Mon, 01 Mar 2021 13:34:51 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c086:5f6:85dd:98c8]) by smtp.gmail.com with ESMTPSA id f13sm790366pjj.1.2021.03.01.13.34.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 13:34:51 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Rob Clark , Alexandru M Stan , Stephen Boyd , Matthias Kaehlcke , Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 04/13] arm64: dts: qcom: Unify the sc7180-trogdor panel nodes Date: Mon, 1 Mar 2021 13:34:28 -0800 Message-Id: <20210301133318.v2.4.I1483fac4c5ae4b2d7660290ff85d69945292618f@changeid> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210301213437.4165775-1-dianders@chromium.org> References: <20210301213437.4165775-1-dianders@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Let's avoid a bit of duplication by pushing this up to the trogdor.dtsi file. Signed-off-by: Douglas Anderson Reviewed-by: Matthias Kaehlcke Reviewed-by: Stephen Boyd --- (no changes since v1) .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 21 ++++--------------- .../arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 19 ++++------------- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 15 +++++++++++++ 3 files changed, 23 insertions(+), 32 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index 11269522da50..5efa04d0d256 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -12,23 +12,6 @@ #include "sc7180-trogdor.dtsi" -/ { - panel: panel { - compatible = "boe,nv133fhm-n62"; - power-supply = <&pp3300_dx_edp>; - backlight = <&backlight>; - hpd-gpios = <&sn65dsi86_bridge 2 GPIO_ACTIVE_HIGH>; - - ports { - port { - panel_in_edp: endpoint { - remote-endpoint = <&sn65dsi86_out>; - }; - }; - }; - }; -}; - &ap_sar_sensor { semtech,cs0-ground; semtech,combined-sensors = <3>; @@ -58,6 +41,10 @@ ap_ts: touchscreen@10 { }; }; +&panel { + compatible = "boe,nv133fhm-n62"; +}; + &trackpad { interrupts = <58 IRQ_TYPE_EDGE_FALLING>; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts index bd2c783e0f2f..2b522f9e0d8f 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts @@ -17,21 +17,6 @@ / { model = "Google Trogdor (rev1+)"; compatible = "google,trogdor", "qcom,sc7180"; - - panel: panel { - compatible = "auo,b116xa01"; - power-supply = <&pp3300_dx_edp>; - backlight = <&backlight>; - hpd-gpios = <&sn65dsi86_bridge 2 GPIO_ACTIVE_HIGH>; - - ports { - port { - panel_in_edp: endpoint { - remote-endpoint = <&sn65dsi86_out>; - }; - }; - }; - }; }; ap_ts_pen_1v8: &i2c4 { @@ -53,6 +38,10 @@ ap_ts: touchscreen@10 { }; }; +&panel { + compatible = "auo,b116xa01"; +}; + &pp3300_hub { /* pp3300_l7c is used to power the USB hub */ /delete-property/regulator-always-on; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index b471503e415e..7341fe6e2c0b 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -257,6 +257,21 @@ max98357a: audio-codec-0 { #sound-dai-cells = <0>; }; + panel: panel { + /* Compatible will be filled in per-board */ + power-supply = <&pp3300_dx_edp>; + backlight = <&backlight>; + hpd-gpios = <&sn65dsi86_bridge 2 GPIO_ACTIVE_HIGH>; + + ports { + port { + panel_in_edp: endpoint { + remote-endpoint = <&sn65dsi86_out>; + }; + }; + }; + }; + pwmleds { compatible = "pwm-leds"; keyboard_backlight: keyboard-backlight { From patchwork Mon Mar 1 21:34:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 12110657 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E200C433E0 for ; Mon, 1 Mar 2021 21:43:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 45B9B64D9E for ; Mon, 1 Mar 2021 21:43:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239193AbhCAVma (ORCPT ); Mon, 1 Mar 2021 16:42:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241434AbhCAVk0 (ORCPT ); Mon, 1 Mar 2021 16:40:26 -0500 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85DE4C061221 for ; Mon, 1 Mar 2021 13:34:53 -0800 (PST) Received: by mail-pf1-x436.google.com with SMTP id w18so12406862pfu.9 for ; Mon, 01 Mar 2021 13:34:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W/ES7EoSoJaRFBTGOtbPv13oD9ftUP+s4gLfSf/Rgw0=; b=Of5Qr/1nQ4QTWCJUkTgVjJX/4i11srD3k6K3Y3f9FkGpfmUkd/Wl0ybeV5COOC4rwO bMexSfglrY+AaDkOXQb0hPe7t/KY/hJghH3r10hg6mxI+69xeznPFexB72VksXlb/cTK 0nBeTgW7oDT6yCRspH1RHmZLzG2J7o0GcnD58= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W/ES7EoSoJaRFBTGOtbPv13oD9ftUP+s4gLfSf/Rgw0=; b=qwH4H8K/Eh6+9mLzy/BaN44ce6JdA8RSJ3AXtK/Z3PWieU0pR3zoR6A0VvBV/y58hz aksQjblCbUwZcKVN1RJPtke4MGbim/4z7iXCfmsFzXzYYvGeToajUvxQ3xdkK6ik9cXr WfTIW8pcgDtv07BFZBeJxW0rbOZp83CVCnfwRooF8Yvjm+hm1EMLU3YKmEUQpehcSlZ4 QcnpQGUw33cyN4iwqu9H+qiYbUBp7b8HUwY1F/0E0IJGtgpOMMDx6u9F6DOU6r2Ug3Mt 6igYlgyq2CyMQHneXadelZQwO2xRMhfutqbOWjITfEVwgE6j+JkAIjcfWWsSgRvfmvZH bbbA== X-Gm-Message-State: AOAM532X1io7vyj2sfnKgg4QUJyapwS+bTrZQHvl2myOzDnntRc8ec3b f2M4sd7+KCoy5WzKrfnZ3ew8Tvbjrt11rE+S X-Google-Smtp-Source: ABdhPJzSOFdUhCOZpqR5k47xIE73ykGkKQsXXZIpqcez2jAozspNahIq996f/SXCmfgJw4/uKrjv5Q== X-Received: by 2002:a63:cd41:: with SMTP id a1mr15448738pgj.177.1614634493162; Mon, 01 Mar 2021 13:34:53 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c086:5f6:85dd:98c8]) by smtp.gmail.com with ESMTPSA id f13sm790366pjj.1.2021.03.01.13.34.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 13:34:52 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Rob Clark , Alexandru M Stan , Stephen Boyd , Matthias Kaehlcke , Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 05/13] arm64: dts: qcom: trogdor: Only wakeup from pen eject Date: Mon, 1 Mar 2021 13:34:29 -0800 Message-Id: <20210301133318.v2.5.Ib9672bfbe639c96c85408d6f0217a2609eb0b70f@changeid> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210301213437.4165775-1-dianders@chromium.org> References: <20210301213437.4165775-1-dianders@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Stephen Boyd Configure the pen to be a wakeup source only when the pen is ejected instead of both when the pen is ejected and inserted. This corresponds to wake source requirements. Signed-off-by: Stephen Boyd Signed-off-by: Douglas Anderson Reviewed-by: Matthias Kaehlcke --- (no changes since v1) arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index 7341fe6e2c0b..2e5e3a8f210a 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -6,6 +6,7 @@ */ #include +#include #include #include @@ -245,6 +246,7 @@ pen_insert: pen-insert { gpios = <&tlmm 52 GPIO_ACTIVE_LOW>; linux,code = ; linux,input-type = ; + wakeup-event-action = ; wakeup-source; }; }; From patchwork Mon Mar 1 21:34:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 12110655 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F583C433DB for ; Mon, 1 Mar 2021 21:43:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 23434600EF for ; Mon, 1 Mar 2021 21:43:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239000AbhCAVmY (ORCPT ); Mon, 1 Mar 2021 16:42:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241302AbhCAVkW (ORCPT ); Mon, 1 Mar 2021 16:40:22 -0500 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DECB6C061224 for ; Mon, 1 Mar 2021 13:34:54 -0800 (PST) Received: by mail-pl1-x630.google.com with SMTP id d11so10731773plo.8 for ; Mon, 01 Mar 2021 13:34:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T2YXFSeXixYB8zUM5VCycjoeNDwItv8NZkkhWlNBgNc=; b=ogNOIWyhzVewiAj+Pf/C235RxH6yaxggrI14Ck01MrtgOAAY4u0b+URQ6g66Haspfw JMliee/qwuuqX+gziq/276ENgScQNDEN2CntayjhC3fJnxfe06rypc9wMQWGOxG/HtmT sWL7zLxYtRhKn2arIsCLN1NcoQpJohwkmZ3Xs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T2YXFSeXixYB8zUM5VCycjoeNDwItv8NZkkhWlNBgNc=; b=Egb4L6FQP72IloLALpadUmpfw1Z1puGQOx3kTtbG7MKtqO2KIYPD2xs2LKM7KJRc1y U8rUTLiBuMNEIOHu/3jxDIDeCxN2pP/DCpzlkzltQrxe0KE1di6a0lxSgPcB1ccUsaSS GR1TXRWyWBQhsp8yb1y5ja5pgdYlJZHLj/vZFH0ymKS9NYWgG7G/bz2yMRiDkdC/ejaW uNPBU6eFJoIfkCFQCCK9yZM7TmDlayhp/tlxOCDP8ju3OC/HRSQQmRdJg5riih11wsdv X1lraTZmcbqXFhglRMJEJHFiKxgpDXg1p11mxZTovIJn0DkiuxY5zMo4HMU2xj5Zv01R eInA== X-Gm-Message-State: AOAM532eU9vb5I1+QTme7PQg5UInAC0exylUuHUWjieesRKc+CDC9wvd SLILfXQvxq85gjdqFYdwFvlQ3Q== X-Google-Smtp-Source: ABdhPJxZxS2ruSSIovAo5LqVTbKuJSAPd4ebyV3vD/2C0QPUBoq/fCxB5zz8iE2s3Xevo+iJ1kLJhg== X-Received: by 2002:a17:90b:438a:: with SMTP id in10mr869323pjb.165.1614634494541; Mon, 01 Mar 2021 13:34:54 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c086:5f6:85dd:98c8]) by smtp.gmail.com with ESMTPSA id f13sm790366pjj.1.2021.03.01.13.34.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 13:34:54 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Rob Clark , Alexandru M Stan , Stephen Boyd , Matthias Kaehlcke , Tomasz Figa , Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 06/13] arm64: dts: qcom: Disable camera clk on sc7180-trogdor devices by default Date: Mon, 1 Mar 2021 13:34:30 -0800 Message-Id: <20210301133318.v2.6.I22522b0c9db505ee43ed08e8d5d9e8fe632e7447@changeid> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210301213437.4165775-1-dianders@chromium.org> References: <20210301213437.4165775-1-dianders@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Stephen Boyd We only want to use this clk driver on CoachZ devices. Disable it for all other Trogdor boards. NOTE: CoachZ devices aren't yet supported upstream so until it is this is just disabled for all trogdor. Cc: Tomasz Figa Signed-off-by: Stephen Boyd [dianders:adjusted since no coachz upstream yet] Signed-off-by: Douglas Anderson Reviewed-by: Matthias Kaehlcke --- (no changes since v1) arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index 2e5e3a8f210a..8ae9606351a6 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -570,6 +570,10 @@ cr50: tpm@0 { }; }; +&camcc { + status = "disabled"; +}; + &dsi0 { status = "okay"; vdda-supply = <&vdda_mipi_dsi0_1p2>; From patchwork Mon Mar 1 21:34:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 12110659 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2538CC433E9 for ; Mon, 1 Mar 2021 21:44:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9C90261490 for ; Mon, 1 Mar 2021 21:43:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239273AbhCAVmd (ORCPT ); Mon, 1 Mar 2021 16:42:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241563AbhCAVk3 (ORCPT ); Mon, 1 Mar 2021 16:40:29 -0500 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A2CBC0611C2 for ; Mon, 1 Mar 2021 13:34:56 -0800 (PST) Received: by mail-pf1-x429.google.com with SMTP id q20so12400739pfu.8 for ; Mon, 01 Mar 2021 13:34:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MMu+7km0fh8qJ3Qo5bu6T6EQOvNUU/ih7I+5FOmie9w=; b=G0n8KFEskVWnyDsbOmc7CSmQhKmgOLFeFtgl/BUDqDPq5GaZuJ7QirexijQnoowtD2 IpQwHM7n8pzE1AEM62LtP8h361rFPTO5/8dGsVpu/nWcYii+KUPvKCUvueGPghYr6P7+ OXHCyErGLtLJcIR54m8OKNfTMvOgO46kuWlCM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MMu+7km0fh8qJ3Qo5bu6T6EQOvNUU/ih7I+5FOmie9w=; b=iwG06mGsBe6raJCY99nSH8LVtydXzFBpYNuxN7o13JLgEtDUbl3fV4wkfNfWytMNFv m0/STC4b5TGGbKrDOWQ2dY5hykp33CqBYLa10rKjGnRpzswQvGNL8TPlsld5m9r2IFJc 1RvQ77CvJ80OHCnmnQ3aj8yRpDdMjlEOqY8Vxsm9ERlup9laeZfGFouyMBv4iCxo4a44 H94tphkXcoRCM+/0VpCdJaMbUJnj+5rUdGgF6gF41UZUiqKnpRpmZ3qikoDRCmmNAORe XHib52yaIxEqlO/ZrOznrlyQNBpiCb7bBQDdWv5qCkWJENujyo9Aro+7iRUls018+n5U +MnA== X-Gm-Message-State: AOAM531ylJMbAfUXsC5U/FV/2H0flQeTKlMBQd75qQ0dP0v7UccFJGPO gxqgU8QpwXYtyKNtKLvW9ccM6w== X-Google-Smtp-Source: ABdhPJyahgHOTbow7XaDUrBV+/ZiSgxnmR4vbzmqBCfwRlr87IEiObiYSaL+vfz80QTOytc9PTDLbw== X-Received: by 2002:a62:1911:0:b029:1ed:b722:3b50 with SMTP id 17-20020a6219110000b02901edb7223b50mr426547pfz.70.1614634496131; Mon, 01 Mar 2021 13:34:56 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c086:5f6:85dd:98c8]) by smtp.gmail.com with ESMTPSA id f13sm790366pjj.1.2021.03.01.13.34.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 13:34:55 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Rob Clark , Alexandru M Stan , Stephen Boyd , Matthias Kaehlcke , Craig Hesling , Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 07/13] arm64: dts: qcom: sc7180-trogdor: Remove fp control pins in prep for coachz Date: Mon, 1 Mar 2021 13:34:31 -0800 Message-Id: <20210301133318.v2.7.Ifd7b86f826b18410eada75758a7bca1eebfa336d@changeid> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210301213437.4165775-1-dianders@chromium.org> References: <20210301213437.4165775-1-dianders@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Alexandru M Stan Removed the pinctrl and pin{mux,conf} for the control pins because: 1. The only need for them is for userspace control via flash_fp_mcu 2. cros-ec doesn't know what to do with them, and even if it did, it would interfere with flash_fp_mcu at the most inopportune times Since we're not using hogs, we rely on AP firmware to set all the control pins correctly. Cc: Stephen Boyd Cc: Craig Hesling Signed-off-by: Alexandru M Stan [dianders: adjusted since coachz isn't upstream yet] Reviewed-by; Matthias Kaehlcke Signed-off-by: Douglas Anderson Reviewed-by: Stephen Boyd --- (no changes since v1) arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 45 +------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index 8ae9606351a6..c44be536b288 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -810,7 +810,7 @@ cros_ec_fp: ec@0 { interrupt-parent = <&tlmm>; interrupts = <4 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; - pinctrl-0 = <&fp_to_ap_irq_l>, <&fp_rst_l>, <&fpmcu_boot0>, <&fpmcu_sel>; + pinctrl-0 = <&fp_to_ap_irq_l>; spi-max-frequency = <3000000>; }; }; @@ -1235,48 +1235,6 @@ pinconf { }; }; - fpmcu_boot0: fpmcu-boot0 { - pinmux { - pins = "gpio10"; - function = "gpio"; - }; - - pinconf { - pins = "gpio10"; - bias-disable; - drive-strength = <2>; - output-low; - }; - }; - - fpmcu_sel: fpmcu-sel { - pinmux { - pins = "gpio22"; - function = "gpio"; - }; - - pinconf { - pins = "gpio22"; - bias-disable; - drive-strength = <2>; - output-high; - }; - }; - - fp_rst_l: fp-rst-l { - pinmux { - pins = "gpio5"; - function = "gpio"; - }; - - pinconf { - pins = "gpio5"; - bias-disable; - drive-strength = <2>; - output-high; - }; - }; - fp_to_ap_irq_l: fp-to-ap-irq-l { pinmux { pins = "gpio4"; @@ -1292,7 +1250,6 @@ pinconf { }; }; - h1_ap_int_odl: h1-ap-int-odl { pinmux { pins = "gpio42"; From patchwork Mon Mar 1 21:34:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 12110661 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDB9FC433DB for ; Mon, 1 Mar 2021 21:44:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C043860235 for ; Mon, 1 Mar 2021 21:44:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234148AbhCAVn7 (ORCPT ); Mon, 1 Mar 2021 16:43:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241596AbhCAVka (ORCPT ); Mon, 1 Mar 2021 16:40:30 -0500 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 E5672C0611C3 for ; Mon, 1 Mar 2021 13:34:57 -0800 (PST) Received: by mail-pj1-x1033.google.com with SMTP id o6so455015pjf.5 for ; Mon, 01 Mar 2021 13:34:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NyPAO3qmMJAESm8Q6YxtAhXPNRAsDpKjNqUjjoQ6MmU=; b=QVJ28EEEc4ubhX5nd9gy0c2IeOOM6QCTbe9TTcN2x9EBDTP5X57tnB4w3+V7zdJ2hA DWITea67umHcFIwjZ6q9wD8FJYgb0goqv2Sh771OFXriEVqvsbYOeMssfMmI9T2C2MRG CdhiIDnOEdwr/8E6lb7X3SP3202ZsjLjc/ACI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NyPAO3qmMJAESm8Q6YxtAhXPNRAsDpKjNqUjjoQ6MmU=; b=sev5rx6zb29M1MiSyBIoCE9/nO3PqbLJx2+aRkzTDSS/CiY4MAZk/cmqDauaM0Hlwd zQxhfsnTTLMd3IYhLXmz8l6Y1Evyjfa2wjf49VyPX3YqUNKXmnT8l8YSY3RQBnH4kA1f w/CG6dH74fnugyXU5Ho9M37/Fb2V6G/smD1k1D95+zcW+CMOmc6y+Z+m3HbB5xo8SFOZ CuAafUH2T625JmxcGVlFM+w9XySt20Hfskpm+io9RrfS9Qe7qysScxfijI+QGbbJJZI5 IWNterWfqkxExRbbpm6IsZqKRiPDbLdaMYyK+3QnmDriN3vPBglXKWQFc3iq35CSSeEd ICvw== X-Gm-Message-State: AOAM530JCz2Vjrc81IE/PvFtdh5mFlBnmsq0+CMlvadk9IvRF8+njmtB sjS2WfrJEt5zfxCaX/PTedQUqw== X-Google-Smtp-Source: ABdhPJy4it4H97/a0MqzRlYyd0xzUpzOVUf71Eh/7BCWWK6oClGXkPLFdKj/+oqITEv+3cdAOHekfg== X-Received: by 2002:a17:90b:34c:: with SMTP id fh12mr851107pjb.137.1614634497557; Mon, 01 Mar 2021 13:34:57 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c086:5f6:85dd:98c8]) by smtp.gmail.com with ESMTPSA id f13sm790366pjj.1.2021.03.01.13.34.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 13:34:57 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Rob Clark , Alexandru M Stan , Stephen Boyd , Matthias Kaehlcke , Venkata Lakshmi Narayana Gubba , Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 08/13] arm64: dts: qcom: sc7180: Remove clock for bluetooth on Trogdor Date: Mon, 1 Mar 2021 13:34:32 -0800 Message-Id: <20210301133318.v2.8.I80c268f163e6d49a70af1238be442b5de400c579@changeid> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210301213437.4165775-1-dianders@chromium.org> References: <20210301213437.4165775-1-dianders@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Venkata Lakshmi Narayana Gubba Removed voting for RPMH_RF_CLK2 which is not required as it is getting managed by BT SoC through SW_CTRL line. Cc: Matthias Kaehlcke Signed-off-by: Venkata Lakshmi Narayana Gubba Signed-off-by: Douglas Anderson Reviewed-by: Matthias Kaehlcke Reviewed-by: Stephen Boyd --- (no changes since v1) arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index c44be536b288..aa0efc42d5ea 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -835,7 +835,6 @@ bluetooth: bluetooth { vddrf-supply = <&pp1300_l2c>; vddch0-supply = <&pp3300_l10c>; max-speed = <3200000>; - clocks = <&rpmhcc RPMH_RF_CLK2>; }; }; From patchwork Mon Mar 1 21:34:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 12110663 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 391C2C433E9 for ; Mon, 1 Mar 2021 21:44:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1D19F60235 for ; Mon, 1 Mar 2021 21:44:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237309AbhCAVoH (ORCPT ); Mon, 1 Mar 2021 16:44:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237983AbhCAVkz (ORCPT ); Mon, 1 Mar 2021 16:40:55 -0500 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1C89C061A28 for ; Mon, 1 Mar 2021 13:34:59 -0800 (PST) Received: by mail-pf1-x436.google.com with SMTP id l7so8195248pfd.3 for ; Mon, 01 Mar 2021 13:34:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/v9Pd43iBs+UXvunT6Xej2iPnF6YuJWrIvn13kPe8ps=; b=ER0cDodvgrX0R1orNgdEufheAUD+DGvVilhrK19E8IulYd57qgELzQcP3Y5muluHan LBP+p6Y4jL8/Q0Upaclhbl+YvpUOQlXr1YbfrJLED9ymGlvalRPjAI8SigCJn6izIzhD VgnBEI35E3zSBP7k7wKNaOq+MVhMkno6a5gUM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/v9Pd43iBs+UXvunT6Xej2iPnF6YuJWrIvn13kPe8ps=; b=RA2ufHr5rrEoA1EB9KmhWTKrbGREtG5yjUfjzdf4CiojXECGkm+XLDMHQhv+HEG5tK l0dIoSowt97c9VCj1uzPX4Xc6OmXDsIEyoILSyp1tqC170rluNQ4aAW3P2cmm7F8KtxQ 98Qdklzm9ftSldRTTwT6diFbXNG6zw8H1HV38svyG5Xcmn++Y734FHHXFhDmtToDxDdS uNRkIH8++xaTLmFXiiBEGfcXrIxZTWg9/PwSY2JBJ/QRk3FnPqVJYqGn+QhJF82ECNrl 07idN+WwSgs/87juBKyORppTXGC0/ot9Y3Rxu5BOYEF9vG4pvxkeA3VU5I9TWlLCyH5+ RmIw== X-Gm-Message-State: AOAM533HQ/406MZUg/mi++4inUHyAnKd5WvxNkCZ4G3CZVaL4eyoInfg pavm/U3uuOsNV3e/Gxsf72vYQQ== X-Google-Smtp-Source: ABdhPJzwzy+/N6Jkfo5THvMD7z0G+wqXpC7aqjYsGZ2pJZWXcsDeE47DPaZ/S3RIgqr9ZtmEyDKSiA== X-Received: by 2002:aa7:8f15:0:b029:1ed:9356:a9e with SMTP id x21-20020aa78f150000b02901ed93560a9emr333253pfr.73.1614634499503; Mon, 01 Mar 2021 13:34:59 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c086:5f6:85dd:98c8]) by smtp.gmail.com with ESMTPSA id f13sm790366pjj.1.2021.03.01.13.34.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 13:34:58 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Rob Clark , Alexandru M Stan , Stephen Boyd , Matthias Kaehlcke , Abhishek Kumar , Philip Chen , Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 09/13] arm64: dts: qcom: sc7180: add GO_LAZOR variant property for lazor Date: Mon, 1 Mar 2021 13:34:33 -0800 Message-Id: <20210301133318.v2.9.I4a38fe64dd79c54af80d7e4ef5940f8cf4f86e75@changeid> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210301213437.4165775-1-dianders@chromium.org> References: <20210301213437.4165775-1-dianders@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Abhishek Kumar For trogdor, in the latest board-2.bin file, new BDF with variant name GO_LAZOR has been introduced, so we need this property set, for GO_LAZOR BDF to be picked. Cc: Philip Chen Signed-off-by: Abhishek Kumar [dianders: adjusted subject line and sort order] Signed-off-by: Douglas Anderson Reviewed-by: Matthias Kaehlcke Reviewed-by: Stephen Boyd --- (no changes since v1) arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index 5efa04d0d256..6b10b96173e8 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -49,6 +49,10 @@ &trackpad { interrupts = <58 IRQ_TYPE_EDGE_FALLING>; }; +&wifi { + qcom,ath10k-calibration-variant = "GO_LAZOR"; +}; + /* PINCTRL - modifications to sc7180-trogdor.dtsi */ &trackpad_int_1v8_odl { From patchwork Mon Mar 1 21:34:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 12110665 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67361C4332B for ; Mon, 1 Mar 2021 21:44:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4615560232 for ; Mon, 1 Mar 2021 21:44:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236972AbhCAVoO (ORCPT ); Mon, 1 Mar 2021 16:44:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237430AbhCAVmU (ORCPT ); Mon, 1 Mar 2021 16:42:20 -0500 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E22AC061A2D for ; Mon, 1 Mar 2021 13:35:01 -0800 (PST) Received: by mail-pf1-x431.google.com with SMTP id j12so12375999pfj.12 for ; Mon, 01 Mar 2021 13:35:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TlWXwvFYXokduORUwulUZ7cOw3te/q/W8pSCRFa5whA=; b=Sl4NNWg8xqy7BpI7lsrbZPkY9kICEuQ4HWufUUAIfGK9vHMSr+64D9WT+oJTUT8u28 d3ZeKB5ZYGJLYcyHGlsV81PPgPTvMa0at9WNq1D7myvxh9wBfK5i6LcqfZtz35B4Tmrl WkC+69sxOb2AJY8Kl94JxgfgroPNq9n0fzdPE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TlWXwvFYXokduORUwulUZ7cOw3te/q/W8pSCRFa5whA=; b=JbObEgmpR/ICxNjjwAfgheAeSf8C307QvRrZTnSZOcQDx4qJ8UUMDxvB3x4F63G4Eu wUm4nCY9r4oQdfaq9DnNES6QtDo6pKNopr4NiMi7jhG4Y5zUasWODtmWUnPuMmuf2a3g NEpkDDGXROTr1DV7PIlCouVzcygzsA0j1hmXO/csl7qTGmTShwF11kUKDrgEu3fypbwA 1mUI59tYXSlemS0Lpo0d/nRU8LYCeCcioxOKux7sRKcUl0FLkbXd9VCv1de3KrD+UOMB bCU8oMP1RON6Ob5ueENUeHXb/U27nlQ85jIk6/et5P833AyyXd82KEl/e/ne9jonfrsZ Y1wA== X-Gm-Message-State: AOAM5329heZvY/4xwBEQmeJlNSz7T67i3jkpsjZ1X3S5vlcaVLnY0bSA OQMtRNp+KNn6X+Kj3fZs/ND/YQ== X-Google-Smtp-Source: ABdhPJzlinyEIqF2J0y3A4xwcOxYj8VLODA3XlbQmIvff/Zcr8Go+6OyKGPZXU+ELjrkKODCSbzx4Q== X-Received: by 2002:a63:4708:: with SMTP id u8mr15326609pga.102.1614634500799; Mon, 01 Mar 2021 13:35:00 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c086:5f6:85dd:98c8]) by smtp.gmail.com with ESMTPSA id f13sm790366pjj.1.2021.03.01.13.34.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 13:35:00 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Rob Clark , Alexandru M Stan , Stephen Boyd , Matthias Kaehlcke , Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 10/13] arm64: dts: qcom: sc7180: Set up lazor r3+ as sc7180-lite SKUs Date: Mon, 1 Mar 2021 13:34:34 -0800 Message-Id: <20210301133318.v2.10.Ia3795e192f5bbe17e6714e45fcb0bf5acdbd4c17@changeid> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210301213437.4165775-1-dianders@chromium.org> References: <20210301213437.4165775-1-dianders@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Matthias Kaehlcke Lazor rev3 and later use the 'lite' version of the SC7180 SoC. Cc: Stephen Boyd Signed-off-by: Matthias Kaehlcke [dianders: Adjust commit message which referred to downstream history] Signed-off-by: Douglas Anderson Reviewed-by: Stephen Boyd --- (no changes since v1) arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 5 ++++- arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 4 +++- arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts index 6985beb97e53..dcb41afdc82a 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts @@ -5,7 +5,10 @@ * Copyright 2020 Google LLC. */ -#include "sc7180-trogdor-lazor-r3.dts" +/dts-v1/; + +#include "sc7180-trogdor-lazor.dtsi" +#include "sc7180-lite.dtsi" / { model = "Google Lazor (rev3+) with KB Backlight"; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts index 0881f8dd02c9..be44900602d7 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts @@ -5,7 +5,9 @@ * Copyright 2020 Google LLC. */ -#include "sc7180-trogdor-lazor-r3.dts" +/dts-v1/; + +#include "sc7180-trogdor-lazor.dtsi" #include "sc7180-trogdor-lte-sku.dtsi" / { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts index 19e69adb9e04..ea8c2ee09741 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts @@ -8,6 +8,7 @@ /dts-v1/; #include "sc7180-trogdor-lazor.dtsi" +#include "sc7180-lite.dtsi" / { model = "Google Lazor (rev3+)"; From patchwork Mon Mar 1 21:34:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 12110669 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE8F6C433DB for ; Mon, 1 Mar 2021 21:45:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B5A80600EF for ; Mon, 1 Mar 2021 21:45:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238086AbhCAVo2 (ORCPT ); Mon, 1 Mar 2021 16:44:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240107AbhCAVmp (ORCPT ); Mon, 1 Mar 2021 16:42:45 -0500 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14D70C0610CE for ; Mon, 1 Mar 2021 13:35:03 -0800 (PST) Received: by mail-pg1-x529.google.com with SMTP id t26so12482363pgv.3 for ; Mon, 01 Mar 2021 13:35:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aHmWBB6HuTM9AzOvkula5c0v/SuO+ofpwQAgQj/t6ek=; b=EEWONlpFBt0WCFISzj+sV5vNOpNoXqTCqfapOdRG2UY782ccKtwfiBloRcC/NI+bif HeN/zc7NWr6SwKHEFMT7suSKtAzAOqAmOVgHYuYaCi8DRLaNFxDiKSfHuhaadRhAb24f O7EzgW2bNEejx8uk6tbKtGjQEVus94z3/NCAI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aHmWBB6HuTM9AzOvkula5c0v/SuO+ofpwQAgQj/t6ek=; b=DB8xuV7AgkhuJ61qSt0+wZhRBmOFfAmvOahtSmINcFw+8XLQuGwdotvGSgEKgveE9I 2MUpm7FgOGqK0+tahAgIVm/unruQ9Fa/Yjwh6gmnfJK14R8NImUisN7fVUDs0fyLI3/j +91teFwUSvB0flLdH+GYeWnzyxGlwgwMCanckMUG9NuUIAIOORL+bXO8W5XpGoSoO4YY q0UFF5dwwUse7MXPJI8iIKnu7ud9OUjm9CEbdm1cARGuvoCyYQ/rNHeIc00jHDkftPCb Ct4iwkRnmsg4fL136E4umKvE6F2Mv+1p+Jh0shfG5WoYj0VrEpgJp5DKI5wIdxuAURbV 13zQ== X-Gm-Message-State: AOAM533f21TGaB1qUdcV4ExIudyX6FB9OOd+4q9PfNYlSxxpJVErx0MA gsiSk2g3hD9e+9rjaaq036qB3Q== X-Google-Smtp-Source: ABdhPJxFCYGeUxZo3SMWHBHMQPTXVpCsNG4vgi8kjEifPHETvq4cdUZJQZOZQJCiFBcrc7oL2f1XFA== X-Received: by 2002:a05:6a00:1582:b029:1bc:fb40:4bd7 with SMTP id u2-20020a056a001582b02901bcfb404bd7mr17339167pfk.41.1614634502499; Mon, 01 Mar 2021 13:35:02 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c086:5f6:85dd:98c8]) by smtp.gmail.com with ESMTPSA id f13sm790366pjj.1.2021.03.01.13.35.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 13:35:01 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Rob Clark , Alexandru M Stan , Stephen Boyd , Matthias Kaehlcke , Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 11/13] arm64: dts: qcom: Add sc7180-lazor-limozeen skus Date: Mon, 1 Mar 2021 13:34:35 -0800 Message-Id: <20210301133318.v2.11.I556326b24441e22c8c429ce383cc157c7aaef44b@changeid> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210301213437.4165775-1-dianders@chromium.org> References: <20210301213437.4165775-1-dianders@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This is a SKU variant of lazor. Add it. This squashes the downstream patches to support this hardware. NOTES: - The non-touch SKU actually has "innolux,n116bca-ea1" but that driver is still pending in simple-panel. The bindings have been Acked though [1]. Things work well enough with the "innolux,n116bge" timings for now, though. - The wonky special dts just for "-rev4" arguably doesn't need to go upstream since they weren't widely distributed, but since a few people have them we might as well. If it ever causes problems we can delete it. [1] https://lore.kernel.org/r/20210115144345.v2.4.I6889e21811df6adaff5c5b8a8c80fda0669ab3a5@changeid Cc: Stephen Boyd Signed-off-by: Douglas Anderson Reviewed-by: Matthias Kaehlcke Reviewed-by: Stephen Boyd --- Changes in v2: - Add link to Acked bindings. - Proper compatible for the "correct" panel (added -ea1 suffix). arch/arm64/boot/dts/qcom/Makefile | 3 ++ .../sc7180-trogdor-lazor-limozeen-nots-r4.dts | 34 +++++++++++++++ .../sc7180-trogdor-lazor-limozeen-nots.dts | 26 ++++++++++++ .../qcom/sc7180-trogdor-lazor-limozeen.dts | 42 +++++++++++++++++++ 4 files changed, 105 insertions(+) create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen.dts diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 549a7a2151d4..adc915a5f027 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -38,6 +38,9 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3-kb.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3-lte.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r4.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm630-sony-xperia-ganges-kirin.dtb diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts new file mode 100644 index 000000000000..6ebde0828550 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts @@ -0,0 +1,34 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Lazor Limozeen board device tree source + * + * Copyright 2020 Google LLC. + */ + +#include "sc7180-trogdor-lazor-limozeen-nots.dts" + +/ { + model = "Google Lazor Limozeen without Touchscreen (rev4)"; + compatible = "google,lazor-rev4-sku5", "qcom,sc7180"; +}; + +/* + * rev4-sku5 was built with a different trackpad. + */ +/delete-node/&trackpad; +&ap_tp_i2c { + trackpad: trackpad@2c { + compatible = "hid-over-i2c"; + reg = <0x2c>; + pinctrl-names = "default"; + pinctrl-0 = <&tp_int_odl>; + + interrupt-parent = <&tlmm>; + interrupts = <58 IRQ_TYPE_EDGE_FALLING>; + + vcc-supply = <&pp3300_fp_tp>; + hid-descr-addr = <0x20>; + + wakeup-source; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts new file mode 100644 index 000000000000..0456c7e05d00 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts @@ -0,0 +1,26 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Lazor Limozeen board device tree source + * + * Copyright 2020 Google LLC. + */ + +/dts-v1/; + +#include "sc7180-trogdor-lazor.dtsi" +#include "sc7180-trogdor-lte-sku.dtsi" + +/ { + model = "Google Lazor Limozeen without Touchscreen"; + compatible = "google,lazor-sku6", "google,lazor-sku5", "qcom,sc7180"; +}; + +/delete-node/&ap_ts; + +&panel { + compatible = "innolux,n116bca-ea1", "innolux,n116bge"; +}; + +&sdhc_2 { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen.dts new file mode 100644 index 000000000000..e6ad6dae4e60 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen.dts @@ -0,0 +1,42 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Lazor Limozeen board device tree source + * + * Copyright 2020 Google LLC. + */ + +/dts-v1/; + +#include "sc7180-trogdor-lazor.dtsi" +#include "sc7180-trogdor-lte-sku.dtsi" + +/ { + model = "Google Lazor Limozeen"; + compatible = "google,lazor-sku4", "qcom,sc7180"; +}; + +/delete-node/&ap_ts; + +&ap_ts_pen_1v8 { + ap_ts: touchscreen@10 { + compatible = "elan,ekth3500"; + reg = <0x10>; + pinctrl-names = "default"; + pinctrl-0 = <&ts_int_l>, <&ts_reset_l>; + + interrupt-parent = <&tlmm>; + interrupts = <9 IRQ_TYPE_LEVEL_LOW>; + + vcc33-supply = <&pp3300_ts>; + + reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>; + }; +}; + +&panel { + compatible = "auo,b116xa01"; +}; + +&sdhc_2 { + status = "okay"; +}; From patchwork Mon Mar 1 21:34:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 12110667 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78496C433DB for ; Mon, 1 Mar 2021 21:44:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 43E0260235 for ; Mon, 1 Mar 2021 21:44:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237430AbhCAVoX (ORCPT ); Mon, 1 Mar 2021 16:44:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240408AbhCAVmp (ORCPT ); Mon, 1 Mar 2021 16:42:45 -0500 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73113C061A86 for ; Mon, 1 Mar 2021 13:35:04 -0800 (PST) Received: by mail-pf1-x42d.google.com with SMTP id q204so11350080pfq.10 for ; Mon, 01 Mar 2021 13:35:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fjurcXM216amT7210txb64G64V6ZiCfzq1JqsNMQIVI=; b=M23wfjIem/EfkSDN8vSSr6ePUtqD9WSgofP5Oh9OP/sPBF3jI/WvB+kqloiLE7M0UE qqrTBPQbUydWlaG+WBg7ILd8MetBR288zUY61sBPkqqUgKwL0qvEuJRGwnjVw81Lcyyv Y5+JR5lFq9+Tz3KrIF12L4eidgRa3chJiNEsw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fjurcXM216amT7210txb64G64V6ZiCfzq1JqsNMQIVI=; b=V9WGNOUEWz9UezRebakvlwMoY3j0jKflNsQEQTAbblGHKL75i9wECPyRkqFNYM2p2H Z4epc+oO4m5EXSY1Gm21bzo7a/TtJgItkGQiCYsBGVR2mPsXyX4kyDaW9BQ8gcQLx53C JJ1mwV19Z2/q+JUxk/PP0QeIr+f/QaaTIK2JPiAIG9BHf7wKqSmnASqblIo2MzfOgcn9 lAoXWAJqlkhABPJaY33ACChQ7jsYIioWY86zzcSHjlm7N5Xs9qS3LHXxQCDrmHCLqCxA MdMHCQ/Pwam1RcVrF4b8ejP3zZwnscA2lTVxiiRW1FbL/oFqjC+PsDfbkD7FPq5nUXba D7dA== X-Gm-Message-State: AOAM5317wJkS9CKAu/7lrJbU0hjrMJyLI0vGV+/36rkTq6/gE7YvI4Hq 83sYsUkGkbDZ+L86vOuqYzZhow== X-Google-Smtp-Source: ABdhPJwt6whBM0x/cZIogvdmab631CR4/pzYyvsd/I5xQR9vdZhgcQ4C0lUiDkyhZVhrewkpqcFR+g== X-Received: by 2002:a63:d502:: with SMTP id c2mr15028215pgg.353.1614634504038; Mon, 01 Mar 2021 13:35:04 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c086:5f6:85dd:98c8]) by smtp.gmail.com with ESMTPSA id f13sm790366pjj.1.2021.03.01.13.35.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 13:35:03 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Rob Clark , Alexandru M Stan , Stephen Boyd , Matthias Kaehlcke , Douglas Anderson , Philip Chen , Tzung-Bi Shih , Judy Hsiao , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 12/13] arm64: dts: qcom: Add sc7180-trogdor-pompom skus Date: Mon, 1 Mar 2021 13:34:36 -0800 Message-Id: <20210301133318.v2.12.If93a01b30d20dccacbad4be8ddc519dc20a51a1e@changeid> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210301213437.4165775-1-dianders@chromium.org> References: <20210301213437.4165775-1-dianders@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This is a trogdor variant. This is mostly a grab from the downstream tree with notable exceptions: - I skip -rev0. This was a super early build and there's no advantage of long term support. - In -rev1 I translate the handling of the USB hub like is done for similar boards. See the difference between the downstream and upstream 'sc7180-trogdor-lazor-r0.dts' for an example. This will need to be resolved when proper support for the USB hub is figured out upstream. - I remove sound node since sound hasn't landed upstream yet. - In incorporate the pending for the keyboard. Cc: Philip Chen Cc: Matthias Kaehlcke Cc: Stephen Boyd Cc: Tzung-Bi Shih Cc: Judy Hsiao Signed-off-by: Douglas Anderson Reviewed-by: Matthias Kaehlcke Reviewed-by: Stephen Boyd --- Changes in v2: - Rebase atop commit 7822de1a2946 ("arm64:...1 for charger temperature") - lazor => trogdor in subject arch/arm64/boot/dts/qcom/Makefile | 4 + .../dts/qcom/sc7180-trogdor-pompom-r1-lte.dts | 14 + .../dts/qcom/sc7180-trogdor-pompom-r1.dts | 26 ++ .../dts/qcom/sc7180-trogdor-pompom-r2-lte.dts | 14 + .../dts/qcom/sc7180-trogdor-pompom-r2.dts | 44 +++ .../boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 288 ++++++++++++++++++ 6 files changed, 390 insertions(+) create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index adc915a5f027..d7cdff3dad98 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -41,6 +41,10 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r4.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r1.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r1-lte.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r2.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r2-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm630-sony-xperia-ganges-kirin.dtb diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts new file mode 100644 index 000000000000..0202f03eafe6 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Pompom board device tree source + * + * Copyright 2020 Google LLC. + */ + +#include "sc7180-trogdor-pompom-r1.dts" +#include "sc7180-trogdor-lte-sku.dtsi" + +/ { + model = "Google Pompom (rev1) with LTE"; + compatible = "google,pompom-rev1-sku0", "qcom,sc7180"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts new file mode 100644 index 000000000000..e720e7bd0d70 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts @@ -0,0 +1,26 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Pompom board device tree source + * + * Copyright 2020 Google LLC. + */ + +/dts-v1/; + +#include "sc7180-trogdor-pompom.dtsi" + +/ { + model = "Google Pompom (rev1)"; + compatible = "google,pompom-rev1", "qcom,sc7180"; +}; + +&pp3300_hub { + /* pp3300_l7c is used to power the USB hub */ + /delete-property/regulator-always-on; + /delete-property/regulator-boot-on; +}; + +&pp3300_l7c { + regulator-always-on; + regulator-boot-on; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts new file mode 100644 index 000000000000..791d496ad046 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Pompom board device tree source + * + * Copyright 2020 Google LLC. + */ + +#include "sc7180-trogdor-pompom-r2.dts" +#include "sc7180-trogdor-lte-sku.dtsi" + +/ { + model = "Google Pompom (rev2+) with LTE"; + compatible = "google,pompom-sku0", "qcom,sc7180"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts new file mode 100644 index 000000000000..984d7337da78 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts @@ -0,0 +1,44 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Pompom board device tree source + * + * Copyright 2020 Google LLC. + */ + +/dts-v1/; + +#include "sc7180-trogdor-pompom.dtsi" + +/ { + model = "Google Pompom (rev2+)"; + compatible = "google,pompom", "qcom,sc7180"; +}; + +&keyboard_controller { + function-row-physmap = < + MATRIX_KEY(0x00, 0x02, 0) /* T1 */ + MATRIX_KEY(0x03, 0x02, 0) /* T2 */ + MATRIX_KEY(0x02, 0x02, 0) /* T3 */ + MATRIX_KEY(0x01, 0x02, 0) /* T4 */ + MATRIX_KEY(0x03, 0x04, 0) /* T5 */ + MATRIX_KEY(0x02, 0x04, 0) /* T6 */ + MATRIX_KEY(0x01, 0x04, 0) /* T7 */ + MATRIX_KEY(0x02, 0x09, 0) /* T8 */ + MATRIX_KEY(0x01, 0x09, 0) /* T9 */ + MATRIX_KEY(0x00, 0x04, 0) /* T10 */ + >; + linux,keymap = < + MATRIX_KEY(0x00, 0x02, KEY_BACK) + MATRIX_KEY(0x03, 0x02, KEY_REFRESH) + MATRIX_KEY(0x02, 0x02, KEY_ZOOM) + MATRIX_KEY(0x01, 0x02, KEY_SCALE) + MATRIX_KEY(0x03, 0x04, KEY_SYSRQ) + MATRIX_KEY(0x02, 0x04, KEY_BRIGHTNESSDOWN) + MATRIX_KEY(0x01, 0x04, KEY_BRIGHTNESSUP) + MATRIX_KEY(0x02, 0x09, KEY_MUTE) + MATRIX_KEY(0x01, 0x09, KEY_VOLUMEDOWN) + MATRIX_KEY(0x00, 0x04, KEY_VOLUMEUP) + + CROS_STD_MAIN_KEYMAP + >; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi new file mode 100644 index 000000000000..d253a08f6fc8 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi @@ -0,0 +1,288 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Pompom board device tree source + * + * Copyright 2020 Google LLC. + */ + +#include "sc7180.dtsi" + +ap_ec_spi: &spi6 {}; +ap_h1_spi: &spi0 {}; + +#include "sc7180-trogdor.dtsi" + +/ { + thermal-zones { + 5v-choke-thermal { + polling-delay-passive = <0>; + polling-delay = <250>; + + thermal-sensors = <&pm6150_adc_tm 1>; + + trips { + 5v-choke-crit { + temperature = <125000>; + hysteresis = <1000>; + type = "critical"; + }; + }; + }; + }; +}; + +&alc5682 { + realtek,dmic-clk-driving-high = "true"; +}; + +&cpu6_alert0 { + temperature = <60000>; +}; + +&cpu6_alert1 { + temperature = <65000>; +}; + +&cpu6_thermal { + sustainable-power = <948>; +}; + +&cpu7_alert0 { + temperature = <60000>; +}; + +&cpu7_alert1 { + temperature = <65000>; +}; + +&cpu7_thermal { + sustainable-power = <948>; +}; + +&cpu8_alert0 { + temperature = <60000>; +}; + +&cpu8_alert1 { + temperature = <65000>; +}; + +&cpu8_thermal { + sustainable-power = <948>; +}; + +&cpu9_alert0 { + temperature = <60000>; +}; + +&cpu9_alert1 { + temperature = <65000>; +}; + +&cpu9_thermal { + sustainable-power = <948>; +}; + +&gpio_keys { + status = "okay"; +}; + +ap_ts_pen_1v8: &i2c4 { + status = "okay"; + clock-frequency = <400000>; + + ap_ts: touchscreen@10 { + compatible = "hid-over-i2c"; + reg = <0x10>; + pinctrl-names = "default"; + pinctrl-0 = <&ts_int_l>, <&ts_reset_l>; + + interrupt-parent = <&tlmm>; + interrupts = <9 IRQ_TYPE_LEVEL_LOW>; + + post-power-on-delay-ms = <20>; + hid-descr-addr = <0x0001>; + + vdd-supply = <&pp3300_ts>; + }; +}; + +&panel { + compatible = "kingdisplay,kd116n21-30nv-a010"; +}; + +&pen_insert { + /* Insert = high, eject = low */ + gpios = <&tlmm 52 GPIO_ACTIVE_HIGH>; +}; + +&pm6150_adc { + 5v-choke-thermistor@4e { + reg = ; + qcom,ratiometric; + qcom,hw-settle-time = <200>; + }; +}; + +&pm6150_adc_tm { + status = "okay"; + + 5v-choke-thermistor@1 { + reg = <1>; + io-channels = <&pm6150_adc ADC5_AMUX_THM2_100K_PU>; + qcom,ratiometric; + qcom,hw-settle-time-us = <200>; + }; +}; + +&sdhc_2 { + status = "okay"; +}; + +&usb_c1 { + status = "disabled"; +}; + +&wifi { + qcom,ath10k-calibration-variant = "GO_POMPOM"; +}; + +/* PINCTRL - board-specific pinctrl */ + +&tlmm { + gpio-line-names = "TP_INT_ODL", + "AP_RAM_ID0", + "AP_SKU_ID2", + "AP_RAM_ID1", + "", + "AP_RAM_ID2", + "AP_TP_I2C_SDA", + "AP_TP_I2C_SCL", + "TS_RESET_L", + "TS_INT_L", + "", + "EDP_BRIJ_IRQ", + "AP_EDP_BKLTEN", + "", + "", + "EDP_BRIJ_I2C_SDA", + "EDP_BRIJ_I2C_SCL", + "HUB_RST_L", + "", + "", + "", + "", + "", + "AMP_EN", + "P_SENSOR_INT_L", + "AP_SAR_SENSOR_SDA", + "AP_SAR_SENSOR_SCL", + "", + "HP_IRQ", + "", + "EN_PP3300_DX_EDP", + "AP_BRD_ID2", + "BRIJ_SUSPEND", + "AP_BRD_ID0", + "AP_H1_SPI_MISO", + "AP_H1_SPI_MOSI", + "AP_H1_SPI_CLK", + "AP_H1_SPI_CS_L", + "", + "", + "", + "", + "H1_AP_INT_ODL", + "", + "UART_AP_TX_DBG_RX", + "UART_DBG_TX_AP_RX", + "HP_I2C_SDA", + "HP_I2C_SCL", + "FORCED_USB_BOOT", + "AMP_BCLK", + "AMP_LRCLK", + "AMP_DIN", + "PEN_PDCT_L", + "HP_BCLK", + "HP_LRCLK", + "HP_DOUT", + "HP_DIN", + "HP_MCLK", + "AP_SKU_ID0", + "AP_EC_SPI_MISO", + "AP_EC_SPI_MOSI", + "AP_EC_SPI_CLK", + "AP_EC_SPI_CS_L", + "AP_SPI_CLK", + "AP_SPI_MOSI", + "AP_SPI_MISO", + /* + * AP_FLASH_WP_L is crossystem ABI. Schematics + * call it BIOS_FLASH_WP_L. + */ + "AP_FLASH_WP_L", + "", + "AP_SPI_CS0_L", + "SD_CD_ODL", + "", + "", + "", + "", + "", + "UIM2_DATA", + "UIM2_CLK", + "UIM2_RST", + "UIM2_PRESENT", + "UIM1_DATA", + "UIM1_CLK", + "UIM1_RST", + "", + "EN_PP3300_CODEC", + "EN_PP3300_HUB", + "", + "DMIC_SEL", + "", + "", + "", + "AP_SKU_ID1", + "AP_RST_REQ", + "", + "AP_BRD_ID1", + "AP_EC_INT_R_L", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "EDP_BRIJ_EN", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "AP_TS_PEN_I2C_SDA", + "AP_TS_PEN_I2C_SCL", + "DP_HOT_PLUG_DET", + "EC_IN_RW_ODL"; + + dmic_sel: dmic-sel { + pinmux { + pins = "gpio86"; + function = "gpio"; + }; + + pinconf { + pins = "gpio86"; + bias-pull-down; + }; + }; +}; From patchwork Mon Mar 1 21:34:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 12110677 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41A7EC433E9 for ; Mon, 1 Mar 2021 21:47:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 116D8601FD for ; Mon, 1 Mar 2021 21:47:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239428AbhCAVqf (ORCPT ); Mon, 1 Mar 2021 16:46:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244228AbhCAVnQ (ORCPT ); Mon, 1 Mar 2021 16:43:16 -0500 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD055C061D7C for ; Mon, 1 Mar 2021 13:35:05 -0800 (PST) Received: by mail-pf1-x435.google.com with SMTP id r5so12382247pfh.13 for ; Mon, 01 Mar 2021 13:35:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i66nQOCRTMm5enna8oj71EIaR0myji5BIfhqGdlTvaE=; b=WO87xn/DLvTP+38ld0qhnQD0e37G4/g1mHhV4hGQbePl7PKbhpyHsK4NlJmX2qCs/9 8GFzb2HcVdX1CKY1t1ZAU8jzvTmKCg2Nm2aZxyl7ckGTc59/ErLS1myBFOvsl/b900jV c1HxMXYdfz3UYrm7QGPpk9lgf8HtY3cDiNCiE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i66nQOCRTMm5enna8oj71EIaR0myji5BIfhqGdlTvaE=; b=V7WBtrvSQEdsvwov5LgyxQ/QGK54SwzOSasdIcQwlpU/+WDXZWZTPSK6iQqXATr3hM imbssKxzpeU1Yw59knZLpOyTVLRRX5+e7UiM2noiEptjDobDXEBQSx82dFDAKwM7UvnQ C22VssT5Z970vzr2LL7Tfa/id0ft+3Rzs7ZtBkT7QsdfHqMf2OK6J5RFZdbJsfO1h71h 2/Qd4yQNolyyYTEIyvaGnIXBCjQlbkojLyYtjoxRgWm7zKJ/lpBDVn/+HFnwU13Bf84V UMapfkzJsZV1lPsX0m2P6nQPqfYHIp2+Bbwb98OkwPMoSQx+damED75ZJy4IFz0YHCq9 fIPw== X-Gm-Message-State: AOAM533AZGcX6jFQJAyOyLajb+NClLGwk1fXRdh2Ef9m8pUErsvsjzYi 3FQbBiix64RQh6g5Bl/ixRbq1g== X-Google-Smtp-Source: ABdhPJwuhD1eJnOI82S4v7vh2FAlYRIAap+tFAMoF5vWFrai7MtNJP7UGAO0zymrOKhiIEkVIoTZcw== X-Received: by 2002:a63:fa02:: with SMTP id y2mr15294018pgh.412.1614634505458; Mon, 01 Mar 2021 13:35:05 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c086:5f6:85dd:98c8]) by smtp.gmail.com with ESMTPSA id f13sm790366pjj.1.2021.03.01.13.35.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 13:35:05 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Rob Clark , Alexandru M Stan , Stephen Boyd , Matthias Kaehlcke , Douglas Anderson , Gwendal Grignou , Tzung-Bi Shih , Judy Hsiao , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 13/13] arm64: dts: qcom: Add sc7180-trogdor-coachz skus Date: Mon, 1 Mar 2021 13:34:37 -0800 Message-Id: <20210301133318.v2.13.I3d1f5f8a3bf31e8014229df0d4cfdff20e9cc90f@changeid> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210301213437.4165775-1-dianders@chromium.org> References: <20210301213437.4165775-1-dianders@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This is a trogdor variant. This is mostly a grab from the downstream tree with notable exceptions: - I skip -rev0. This was a super early build and there's no advantage of long term support. - I remove sound node since sound hasn't landed upstream yet. Cc: Gwendal Grignou Cc: Matthias Kaehlcke Cc: Stephen Boyd Cc: Tzung-Bi Shih Cc: Judy Hsiao Signed-off-by: Douglas Anderson Reviewed-by: Matthias Kaehlcke Reviewed-by: Stephen Boyd --- NOTE: technically the "google,cros-ec-mkbp-proximity" binding hasn't landed upstream yet. However it has a Reviewed-by from Rob and the series in general sounds about ready to land. If necessary it can be removed / readded later. Changes in v2: - Removed "i2c_wlc" as Stephen suggested. - lazor => trogdor in subject arch/arm64/boot/dts/qcom/Makefile | 4 + .../dts/qcom/sc7180-trogdor-coachz-r1-lte.dts | 18 ++ .../dts/qcom/sc7180-trogdor-coachz-r1.dts | 154 +++++++++++ .../dts/qcom/sc7180-trogdor-coachz-r2-lte.dts | 18 ++ .../dts/qcom/sc7180-trogdor-coachz-r2.dts | 15 ++ .../boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 240 ++++++++++++++++++ 6 files changed, 449 insertions(+) create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index d7cdff3dad98..a81966d59cf7 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -31,6 +31,10 @@ dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-1000.dtb dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-4000.dtb dtb-$(CONFIG_ARCH_QCOM) += qrb5165-rb5.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-idp.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1-lte.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r2.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r2-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r0.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1-kb.dtb diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dts new file mode 100644 index 000000000000..533c048903ea --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google CoachZ board device tree source + * + * Copyright 2020 Google LLC. + */ + +#include "sc7180-trogdor-coachz-r1.dts" +#include "sc7180-trogdor-lte-sku.dtsi" + +/ { + model = "Google CoachZ (rev1) with LTE"; + compatible = "google,coachz-rev1-sku0", "qcom,sc7180"; +}; + +&cros_ec_proximity { + label = "proximity-wifi-lte"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts new file mode 100644 index 000000000000..86619f6c1134 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts @@ -0,0 +1,154 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google CoachZ board device tree source + * + * Copyright 2020 Google LLC. + */ + +/dts-v1/; + +#include "sc7180-trogdor-coachz.dtsi" + +/ { + model = "Google CoachZ (rev1)"; + compatible = "google,coachz-rev1", "qcom,sc7180"; +}; + +&tlmm { + gpio-line-names = "HUB_RST_L", + "AP_RAM_ID0", + "AP_SKU_ID2", + "AP_RAM_ID1", + "FP_TO_AP_IRQ_L", + "AP_RAM_ID2", + "UF_CAM_EN", + "WF_CAM_EN", + "TS_RESET_L", + "TS_INT_L", + "FPMCU_BOOT0", + "EDP_BRIJ_IRQ", + "AP_EDP_BKLTEN", + "UF_CAM_MCLK", + "WF_CAM_CLK", + "EDP_BRIJ_I2C_SDA", + "EDP_BRIJ_I2C_SCL", + "UF_CAM_SDA", + "UF_CAM_SCL", + "WF_CAM_SDA", + "WF_CAM_SCL", + "WLC_IRQ", + "FP_RST_L", + "AMP_EN", + "WLC_NRST", + "AP_SAR_SENSOR_SDA", + "AP_SAR_SENSOR_SCL", + "", + "", + "WF_CAM_RST_L", + "UF_CAM_RST_L", + "AP_BRD_ID2", + "BRIJ_SUSPEND", + "AP_BRD_ID0", + "AP_H1_SPI_MISO", + "AP_H1_SPI_MOSI", + "AP_H1_SPI_CLK", + "AP_H1_SPI_CS_L", + "", + "", + "", + "", + "H1_AP_INT_ODL", + "", + "UART_AP_TX_DBG_RX", + "UART_DBG_TX_AP_RX", + "", + "", + "FORCED_USB_BOOT", + "AMP_BCLK", + "AMP_LRCLK", + "AMP_DIN", + "EN_PP3300_DX_EDP", + "HP_BCLK", + "HP_LRCLK", + "HP_DOUT", + "HP_DIN", + "HP_MCLK", + "AP_SKU_ID0", + "AP_EC_SPI_MISO", + "AP_EC_SPI_MOSI", + "AP_EC_SPI_CLK", + "AP_EC_SPI_CS_L", + "AP_SPI_CLK", + "AP_SPI_MOSI", + "AP_SPI_MISO", + /* + * AP_FLASH_WP_L is crossystem ABI. Schematics + * call it BIOS_FLASH_WP_L. + */ + "AP_FLASH_WP_L", + "", + "AP_SPI_CS0_L", + "SD_CD_ODL", + "", + "", + "", + "", + "FPMCU_SEL", + "UIM2_DATA", + "UIM2_CLK", + "UIM2_RST", + "UIM2_PRESENT_L", + "UIM1_DATA", + "UIM1_CLK", + "UIM1_RST", + "", + "DMIC_CLK_EN", + "HUB_EN", + "", + "AP_SPI_FP_MISO", + "AP_SPI_FP_MOSI", + "AP_SPI_FP_CLK", + "AP_SPI_FP_CS_L", + "AP_SKU_ID1", + "AP_RST_REQ", + "", + "AP_BRD_ID1", + "AP_EC_INT_L", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "EDP_BRIJ_EN", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "AP_TS_PEN_I2C_SDA", + "AP_TS_PEN_I2C_SCL", + "DP_HOT_PLUG_DET", + "EC_IN_RW_ODL"; + + dmic_clk_en: dmic_clk_en { + pinmux { + pins = "gpio83"; + function = "gpio"; + }; + + pinconf { + pins = "gpio83"; + drive-strength = <8>; + bias-pull-up; + }; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2-lte.dts new file mode 100644 index 000000000000..6e7745801fae --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2-lte.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google CoachZ board device tree source + * + * Copyright 2020 Google LLC. + */ + +#include "sc7180-trogdor-coachz-r2.dts" +#include "sc7180-trogdor-lte-sku.dtsi" + +/ { + model = "Google CoachZ (rev2+) with LTE"; + compatible = "google,coachz-sku0", "qcom,sc7180"; +}; + +&cros_ec_proximity { + label = "proximity-wifi-lte"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2.dts new file mode 100644 index 000000000000..4f69b6ba299f --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2.dts @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google CoachZ board device tree source + * + * Copyright 2020 Google LLC. + */ + +/dts-v1/; + +#include "sc7180-trogdor-coachz.dtsi" + +/ { + model = "Google CoachZ (rev2+)"; + compatible = "google,coachz", "qcom,sc7180"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi new file mode 100644 index 000000000000..4ad520f00485 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi @@ -0,0 +1,240 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google CoachZ board device tree source + * + * Copyright 2020 Google LLC. + */ + +#include "sc7180.dtsi" + +ap_ec_spi: &spi6 {}; +ap_h1_spi: &spi0 {}; + +#include "sc7180-trogdor.dtsi" + +/* Deleted nodes from trogdor.dtsi */ + +/delete-node/ &alc5682; +/delete-node/ &pp3300_codec; + +/ { + /* BOARD-SPECIFIC TOP LEVEL NODES */ + + adau7002: audio-codec-1 { + compatible = "adi,adau7002"; + IOVDD-supply = <&pp1800_l15a>; + #sound-dai-cells = <0>; + }; +}; + +&ap_spi_fp { + status = "okay"; +}; + +&backlight { + pwms = <&cros_ec_pwm 0>; +}; + +&camcc { + status = "okay"; +}; + +&cros_ec { + cros_ec_proximity: proximity { + compatible = "google,cros-ec-mkbp-proximity"; + label = "proximity-wifi"; + }; +}; + +ap_ts_pen_1v8: &i2c4 { + status = "okay"; + clock-frequency = <400000>; + + ap_ts: touchscreen@5d { + compatible = "goodix,gt7375p"; + reg = <0x5d>; + pinctrl-names = "default"; + pinctrl-0 = <&ts_int_l>, <&ts_reset_l>; + + interrupt-parent = <&tlmm>; + interrupts = <9 IRQ_TYPE_LEVEL_LOW>; + + reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>; + + vdd-supply = <&pp3300_ts>; + }; +}; + +&i2c7 { + status = "disabled"; +}; + +&i2c9 { + status = "disabled"; +}; + +&panel { + compatible = "boe,nv110wtm-n61"; +}; + +&pp3300_dx_edp { + gpio = <&tlmm 67 GPIO_ACTIVE_HIGH>; +}; + +&sdhc_2 { + status = "okay"; +}; + +&sn65dsi86_out { + data-lanes = <0 1 2 3>; +}; + +/* PINCTRL - modifications to sc7180-trogdor.dtsi */ + +&en_pp3300_dx_edp { + pinmux { + pins = "gpio67"; + }; + + pinconf { + pins = "gpio67"; + }; +}; + +&ts_reset_l { + pinconf { + /* + * We want reset state by default and it will be up to the + * driver to disable this when it's ready. + */ + output-low; + }; +}; + +/* PINCTRL - board-specific pinctrl */ + +&tlmm { + gpio-line-names = "HUB_RST_L", + "AP_RAM_ID0", + "AP_SKU_ID2", + "AP_RAM_ID1", + "FP_TO_AP_IRQ_L", + "AP_RAM_ID2", + "UF_CAM_EN", + "WF_CAM_EN", + "TS_RESET_L", + "TS_INT_L", + "FPMCU_BOOT0", + "EDP_BRIJ_IRQ", + "AP_EDP_BKLTEN", + "UF_CAM_MCLK", + "WF_CAM_CLK", + "EDP_BRIJ_I2C_SDA", + "EDP_BRIJ_I2C_SCL", + "UF_CAM_SDA", + "UF_CAM_SCL", + "WF_CAM_SDA", + "WF_CAM_SCL", + "WLC_IRQ", + "FP_RST_L", + "AMP_EN", + "WLC_NRST", + "AP_SAR_SENSOR_SDA", + "AP_SAR_SENSOR_SCL", + "", + "", + "WF_CAM_RST_L", + "UF_CAM_RST_L", + "AP_BRD_ID2", + "BRIJ_SUSPEND", + "AP_BRD_ID0", + "AP_H1_SPI_MISO", + "AP_H1_SPI_MOSI", + "AP_H1_SPI_CLK", + "AP_H1_SPI_CS_L", + "", + "", + "", + "", + "H1_AP_INT_ODL", + "", + "UART_AP_TX_DBG_RX", + "UART_DBG_TX_AP_RX", + "", + "", + "FORCED_USB_BOOT", + "AMP_BCLK", + "AMP_LRCLK", + "AMP_DIN", + "", + "HP_BCLK", + "HP_LRCLK", + "HP_DOUT", + "HP_DIN", + "HP_MCLK", + "AP_SKU_ID0", + "AP_EC_SPI_MISO", + "AP_EC_SPI_MOSI", + "AP_EC_SPI_CLK", + "AP_EC_SPI_CS_L", + "AP_SPI_CLK", + "AP_SPI_MOSI", + "AP_SPI_MISO", + /* + * AP_FLASH_WP_L is crossystem ABI. Schematics + * call it BIOS_FLASH_WP_L. + */ + "AP_FLASH_WP_L", + "EN_PP3300_DX_EDP", + "AP_SPI_CS0_L", + "SD_CD_ODL", + "", + "", + "", + "", + "EN_FP_RAILS", + "UIM2_DATA", + "UIM2_CLK", + "UIM2_RST", + "UIM2_PRESENT_L", + "UIM1_DATA", + "UIM1_CLK", + "UIM1_RST", + "", + "", + "HUB_EN", + "", + "AP_SPI_FP_MISO", + "AP_SPI_FP_MOSI", + "AP_SPI_FP_CLK", + "AP_SPI_FP_CS_L", + "AP_SKU_ID1", + "AP_RST_REQ", + "", + "AP_BRD_ID1", + "AP_EC_INT_L", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "EDP_BRIJ_EN", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "AP_TS_PEN_I2C_SDA", + "AP_TS_PEN_I2C_SCL", + "DP_HOT_PLUG_DET", + "EC_IN_RW_ODL"; +};