From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9C80C433F5 for ; Wed, 2 Feb 2022 21:24:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347514AbiBBVYQ (ORCPT ); Wed, 2 Feb 2022 16:24:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347487AbiBBVYL (ORCPT ); Wed, 2 Feb 2022 16:24:11 -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 BEB59C06173B for ; Wed, 2 Feb 2022 13:24:11 -0800 (PST) Received: by mail-pf1-x436.google.com with SMTP id c194so386680pfb.12 for ; Wed, 02 Feb 2022 13:24:11 -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=i4WGKpLM5d225Yy80Ebf/msPm9bZWnw4jLfGHHCULaY=; b=kvdClqHx9m5Fx5WsiTKBnO5iR5fKTkWEyaXLdb/SgjByx/xI49QFUeoIRKzrGmHU33 3WBiT7Pb0Y37Mbr1dNzyQMpdkngEwHguZs9gwi758yqDVAOXsRHR1UDrHhRInPx8OS+n 2KyC/i4HRLegFrYfWGFjt5P9mnubLeCRk4Wo4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i4WGKpLM5d225Yy80Ebf/msPm9bZWnw4jLfGHHCULaY=; b=sD/O1pX57onkrbTBm7gn2vgiT86yWW9VZknG0ZSX6Ju4gCm7u5K5r2XoaGKB5dLSLR OAzAxFm/QqRxjvJwjeEMPvK0Xhp+Ge3OiJ+Ayo2uoNMoTqHrC+kKGFmGui1T5wAdMtMb qiZwiYnKeCo25aT4FhcXTIqNIIRyaklO/o/NgraWhWEjseFdgm7y1h7keFrDctOUo7tg Uaqc6Jju2aT9ra+oqRKtaRLXQ657IPkifbohchOrNNAnbVPyShPlrYmvxH5jT1SX+5+Y GLfIsbbmFczpVMDD16Ji5UXERPGH2krWC4OUYulMDYLlXyIFKqU4tBc9tzMpe2RR7THQ cTKw== X-Gm-Message-State: AOAM531RmV2oyjL2qwODZYelqBB2NNoWokzw1E+aKfoxJ9nB0R7hdPXJ 4RA7dAxYzpSt9081kmcKnRPPhQ== X-Google-Smtp-Source: ABdhPJykoMzCtnDv2hPHTz2HWWXMhhw2FS1TINJjCXvSh3UzfrQ40FYv+iRPnS3ADvp6imgLpzgtNQ== X-Received: by 2002:a05:6a00:8d2:: with SMTP id s18mr30930242pfu.5.1643837051273; Wed, 02 Feb 2022 13:24:11 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:f1c4:10b6:b4ef:16e5]) by smtp.gmail.com with ESMTPSA id on9sm7627983pjb.16.2022.02.02.13.24.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 13:24:10 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: pmaliset@codeaurora.org, mka@chromium.org, quic_rjendra@quicinc.com, Shaik Sajida Bhanu , kgodara@codeaurora.org, konrad.dybcio@somainline.org, Sankeerth Billakanti , sibis@codeaurora.org, swboyd@chromium.org, Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 01/14] arm64: dts: qcom: sc7180-trogdor: Add "-regulator" suffix to pp3300_hub Date: Wed, 2 Feb 2022 13:23:35 -0800 Message-Id: <20220202132301.v3.1.I7b284531f1c992932f7eef8abaf7cc5548064f33@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220202212348.1391534-1-dianders@chromium.org> References: <20220202212348.1391534-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" All of the other fixed regulators have the "-regulator" suffix. Add it to pp3300_hub to match. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot= /dts/qcom/sc7180-trogdor.dtsi index 7d8bf66e8ffe..78296ed6fd29 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -284,7 +284,7 @@ pp3300_fp_tp: pp3300-fp-tp-regulator { vin-supply =3D <&pp3300_a>; }; =20 - pp3300_hub: pp3300-hub { + pp3300_hub: pp3300-hub-regulator { compatible =3D "regulator-fixed"; regulator-name =3D "pp3300_hub"; =20 --=20 2.35.0.rc2.247.g8bbb082509-goog From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C367C4167B for ; Wed, 2 Feb 2022 21:24:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347515AbiBBVYT (ORCPT ); Wed, 2 Feb 2022 16:24:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239328AbiBBVYN (ORCPT ); Wed, 2 Feb 2022 16:24:13 -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 4630BC061714 for ; Wed, 2 Feb 2022 13:24:13 -0800 (PST) Received: by mail-pf1-x42d.google.com with SMTP id i186so458548pfe.0 for ; Wed, 02 Feb 2022 13:24:13 -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=lx3TMLoS/ccsHQO3VD+SVt4McQv0p6ZVmWj0lN92NGU=; b=S+FmMe0XDGVbdO6F2612akicEND36WrZ545/CycVbEwrRBh4kp/wdVuVVqNuaUaeF+ 6nbFlmNfNe6kmMPySV3vLO2HSUV1wfTMq6TfParESA95Lplf3Z/0L+fwi3+NQDp6CP15 MXcKVvJiU4k8LFmC8HB1TxNcngIOSce+Rmiew= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lx3TMLoS/ccsHQO3VD+SVt4McQv0p6ZVmWj0lN92NGU=; b=qky1zzzZWfOLhSFJLid73mLUQDxxPurcknsPwYchSkXeV9sJgeYZeDSZN2WTCINayq Fk2ghAt4GyNMlHX7qpqRQOjy30qV0ld5aGGvK6s6oTStCG4y6fLCBYXhVh8QCL4sXr6Y zi3zpod4o0SaiSDkCE2QR1aFb/1TYKE1x4cglEk4lTNAPdxNhWCiXgulpdfyC2PMUJai YKibV0ON3biXGQSIWkwU5dmuOq7CqapPF45A8eAKThOvY6Dikkl6eqgZHOl5UqHrkclN sUN0byI5e7bEw1pX9tYhiC8bItrcp2+yCli8cElqQsl33tddjlS6lXguDUgnLGefyT2L Agew== X-Gm-Message-State: AOAM533DrLfpwDY5Y5WiMnMfxO2i/CKOY8YzOMR3VOGTuZB1re8tqT6U MU3K2E/P48ajcnmdq3k/tzWjsA== X-Google-Smtp-Source: ABdhPJxvlqacvd20dmSeJxHRuX/KACpy2OMOVqGgPZDO27KpcoQz++ErAJUhPqThhWXtLkv9zVrgjg== X-Received: by 2002:aa7:928f:: with SMTP id j15mr31649692pfa.58.1643837052801; Wed, 02 Feb 2022 13:24:12 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:f1c4:10b6:b4ef:16e5]) by smtp.gmail.com with ESMTPSA id on9sm7627983pjb.16.2022.02.02.13.24.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 13:24:12 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: pmaliset@codeaurora.org, mka@chromium.org, quic_rjendra@quicinc.com, Shaik Sajida Bhanu , kgodara@codeaurora.org, konrad.dybcio@somainline.org, Sankeerth Billakanti , sibis@codeaurora.org, swboyd@chromium.org, Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 02/14] arm64: dts: qcom: sc7280-herobrine: Consistently add "-regulator" suffix Date: Wed, 2 Feb 2022 13:23:36 -0800 Message-Id: <20220202132301.v3.2.I627e60c5488d54a45fd1482ca19f0f6e45192db2@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220202212348.1391534-1-dianders@chromium.org> References: <20220202212348.1391534-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Some of the fixed regulators were missing the "-regulator" suffix. Add it to be consistent within the file and consistent with the fixed regulators in sc7180-trogdor. Signed-off-by: Douglas Anderson Reviewed-by: Matthias Kaehlcke --- (no changes since v1) .../boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts b/a= rch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts index ad4fe288b53c..f159b5a6d7ef 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts @@ -177,7 +177,7 @@ pp3300_tp: pp3300-tp-regulator { vin-supply =3D <&pp3300_z1>; }; =20 - pp2850_uf_cam: pp2850-uf-cam { + pp2850_uf_cam: pp2850-uf-cam-regulator { compatible =3D "regulator-fixed"; regulator-name =3D "pp2850_uf_cam"; =20 @@ -192,7 +192,7 @@ pp2850_uf_cam: pp2850-uf-cam { vin-supply =3D <&pp3300_cam>; }; =20 - pp2850_vcm_wf_cam: pp2850-vcm-wf-cam { + pp2850_vcm_wf_cam: pp2850-vcm-wf-cam-regulator { compatible =3D "regulator-fixed"; regulator-name =3D "pp2850_vcm_wf_cam"; =20 @@ -207,7 +207,7 @@ pp2850_vcm_wf_cam: pp2850-vcm-wf-cam { vin-supply =3D <&pp3300_cam>; }; =20 - pp2850_wf_cam: pp2850-wf-cam { + pp2850_wf_cam: pp2850-wf-cam-regulator { compatible =3D "regulator-fixed"; regulator-name =3D "pp2850_wf_cam"; =20 @@ -251,7 +251,7 @@ pp1800_fp: pp1800-fp-regulator { status =3D "disabled"; }; =20 - pp1800_uf_cam: pp1800-uf-cam { + pp1800_uf_cam: pp1800-uf-cam-regulator { compatible =3D "regulator-fixed"; regulator-name =3D "pp1800_uf_cam"; =20 @@ -271,7 +271,7 @@ pp1800_uf_cam: pp1800-uf-cam { vin-supply =3D <&pp1800_l19b>; }; =20 - pp1800_wf_cam: pp1800-wf-cam { + pp1800_wf_cam: pp1800-wf-cam-regulator { compatible =3D "regulator-fixed"; regulator-name =3D "pp1800_wf_cam"; =20 @@ -291,7 +291,7 @@ pp1800_wf_cam: pp1800-wf-cam { vin-supply =3D <&pp1800_l19b>; }; =20 - pp1200_wf_cam: pp1200-wf-cam { + pp1200_wf_cam: pp1200-wf-cam-regulator { compatible =3D "regulator-fixed"; regulator-name =3D "pp1200_wf_cam"; =20 --=20 2.35.0.rc2.247.g8bbb082509-goog From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E818AC43219 for ; Wed, 2 Feb 2022 21:24:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347519AbiBBVYW (ORCPT ); Wed, 2 Feb 2022 16:24:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347516AbiBBVYQ (ORCPT ); Wed, 2 Feb 2022 16:24: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 D1544C061749 for ; Wed, 2 Feb 2022 13:24:14 -0800 (PST) Received: by mail-pf1-x435.google.com with SMTP id i30so404807pfk.8 for ; Wed, 02 Feb 2022 13:24:14 -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=bVsy7mC6OV+ZTsuxBz1mInaazBNug7TJhIqUVGCCLhk=; b=kjWq5FRKAbdMqgqWGIjewgpnPLPgdl86CapN4dR3ymRmPRue1Ctp3PMge7SUPhP6Mo TkZtMJZKiLs/UaQRfdh2N8SLHAFoUTqXVtNieUprqXxJfRLR8G5P6WGdcWkaVa89+7KC FoedlrfFlbgpw+h4pyM8tsZQQH6uMlNPaH4CY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bVsy7mC6OV+ZTsuxBz1mInaazBNug7TJhIqUVGCCLhk=; b=M0vJCC+njqsBWBzkc1p5iqJgN1VC73qKIHf3EeYDeSiimAsLJfKVQjciDi3n6KLELT 9ZkNP0BC8rKX9bb5ECS5DuuRKmx8xwcHfplz7DEwgQNUKtH2MNKTq/PU/i4uWljNDRGZ 662ewaeeT1dOtToRmgwkRZ9OG4i9TRTuqWxsktbSB03B8t79Z3lAltfGIENUADrJQqo0 LSinfqnIzJkQLcYFF12NChQuKW1QQ8tIbVcvbK5qzaW5Ksw/QWCkIc+ILfDhZwPOEF9s 8k0mdL1gJtzm7tCz455fppxZ7iRMQY6FLCnQGgYwtCaksNZPwEAVSmIxb2QT29k85NQu E+eA== X-Gm-Message-State: AOAM530OQqxC+2Pmwcf4AgJsSMpR0mBGKpiwKxVczGuCUUlnivFKEXEB V3aWiAGQDF1i8G+IR0AnMtNybA== X-Google-Smtp-Source: ABdhPJzXn9MxY83qUZRRch/YRy6F25vBzkegCXgRiqWSKcNcpiOfvYbbRC1pqmzeFm+im8dqVcHNHw== X-Received: by 2002:a05:6a00:1345:: with SMTP id k5mr31488525pfu.37.1643837054360; Wed, 02 Feb 2022 13:24:14 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:f1c4:10b6:b4ef:16e5]) by smtp.gmail.com with ESMTPSA id on9sm7627983pjb.16.2022.02.02.13.24.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 13:24:13 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: pmaliset@codeaurora.org, mka@chromium.org, quic_rjendra@quicinc.com, Shaik Sajida Bhanu , kgodara@codeaurora.org, konrad.dybcio@somainline.org, Sankeerth Billakanti , sibis@codeaurora.org, swboyd@chromium.org, Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 03/14] arm64: dts: qcom: sc7280: Properly sort sdc pinctrl lines Date: Wed, 2 Feb 2022 13:23:37 -0800 Message-Id: <20220202132301.v3.3.I6ae594129a8ad3d18af9f5ebffd895b4f6353a0a@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220202212348.1391534-1-dianders@chromium.org> References: <20220202212348.1391534-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The sdc1 / sdc2 pinctrl lines were randomly stuffed in the middle of the qup pinctrl lines. Sort them properly. This is a no-op change. Just code movement. Signed-off-by: Douglas Anderson Reviewed-by: Matthias Kaehlcke --- (no changes since v1) arch/arm64/boot/dts/qcom/sc7280.dtsi | 154 +++++++++++++-------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qco= m/sc7280.dtsi index d4009cc0bb78..40cb414bc377 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -3783,83 +3783,6 @@ qup_uart7_rx: qup-uart7-rx { function =3D "qup07"; }; =20 - sdc1_on: sdc1-on { - clk { - pins =3D "sdc1_clk"; - }; - - cmd { - pins =3D "sdc1_cmd"; - }; - - data { - pins =3D "sdc1_data"; - }; - - rclk { - pins =3D "sdc1_rclk"; - }; - }; - - sdc1_off: sdc1-off { - clk { - pins =3D "sdc1_clk"; - drive-strength =3D <2>; - bias-bus-hold; - }; - - cmd { - pins =3D "sdc1_cmd"; - drive-strength =3D <2>; - bias-bus-hold; - }; - - data { - pins =3D "sdc1_data"; - drive-strength =3D <2>; - bias-bus-hold; - }; - - rclk { - pins =3D "sdc1_rclk"; - bias-bus-hold; - }; - }; - - sdc2_on: sdc2-on { - clk { - pins =3D "sdc2_clk"; - }; - - cmd { - pins =3D "sdc2_cmd"; - }; - - data { - pins =3D "sdc2_data"; - }; - }; - - sdc2_off: sdc2-off { - clk { - pins =3D "sdc2_clk"; - drive-strength =3D <2>; - bias-bus-hold; - }; - - cmd { - pins =3D"sdc2_cmd"; - drive-strength =3D <2>; - bias-bus-hold; - }; - - data { - pins =3D"sdc2_data"; - drive-strength =3D <2>; - bias-bus-hold; - }; - }; - qup_uart8_cts: qup-uart8-cts { pins =3D "gpio32"; function =3D "qup10"; @@ -4019,6 +3942,83 @@ qup_uart15_rx: qup-uart15-rx { pins =3D "gpio63"; function =3D "qup17"; }; + + sdc1_on: sdc1-on { + clk { + pins =3D "sdc1_clk"; + }; + + cmd { + pins =3D "sdc1_cmd"; + }; + + data { + pins =3D "sdc1_data"; + }; + + rclk { + pins =3D "sdc1_rclk"; + }; + }; + + sdc1_off: sdc1-off { + clk { + pins =3D "sdc1_clk"; + drive-strength =3D <2>; + bias-bus-hold; + }; + + cmd { + pins =3D "sdc1_cmd"; + drive-strength =3D <2>; + bias-bus-hold; + }; + + data { + pins =3D "sdc1_data"; + drive-strength =3D <2>; + bias-bus-hold; + }; + + rclk { + pins =3D "sdc1_rclk"; + bias-bus-hold; + }; + }; + + sdc2_on: sdc2-on { + clk { + pins =3D "sdc2_clk"; + }; + + cmd { + pins =3D "sdc2_cmd"; + }; + + data { + pins =3D "sdc2_data"; + }; + }; + + sdc2_off: sdc2-off { + clk { + pins =3D "sdc2_clk"; + drive-strength =3D <2>; + bias-bus-hold; + }; + + cmd { + pins =3D"sdc2_cmd"; + drive-strength =3D <2>; + bias-bus-hold; + }; + + data { + pins =3D"sdc2_data"; + drive-strength =3D <2>; + bias-bus-hold; + }; + }; }; =20 imem@146a5000 { --=20 2.35.0.rc2.247.g8bbb082509-goog From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C517C433F5 for ; Wed, 2 Feb 2022 21:24:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347555AbiBBVYY (ORCPT ); Wed, 2 Feb 2022 16:24:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239250AbiBBVYQ (ORCPT ); Wed, 2 Feb 2022 16:24:16 -0500 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 938E8C061759 for ; Wed, 2 Feb 2022 13:24:16 -0800 (PST) Received: by mail-pl1-x62c.google.com with SMTP id u11so333730plh.13 for ; Wed, 02 Feb 2022 13:24:16 -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=RR+ThUFVWTf4G7m8j1PiXLKZYfrCRssRc6rFuRuA7Cg=; b=Lazeas4oXeIhjdgnNWgPcPxpLUvqGW/Cu9Pf1LZ82E/5h+MMrzFo3+mYJSVvSf5obf 2Rl9mjJ6pVLeTzfH9xLXc1X/NWNT8kB5HLaRV7kCpyOVRto2iLbGl6X67nPeJnQDTDGL sqRr634lr1WNhCj/jf4Z8f1hxe2YykPt0vLy0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RR+ThUFVWTf4G7m8j1PiXLKZYfrCRssRc6rFuRuA7Cg=; b=bh/xIH1PacbAtg451NaxoxSuH+4amL2lzlQb2XY9/JZFvxNsExbIATJHSrHgr2Aa4S 3+ZukLukZUXnFrqbzT/C/p01D28dv2TUF+NFXd8+oVB1W60moT6eeHSYlhm26MLkuoCG J0PXCF+HvYUT6oCnAkCQKsGvBTjY5xMBfArCUomLU5h5apuPvifcHnSwfeDrYb/1QLHl mMvzLsnNctsRDqgtKls/nNfywz2HAwuzDKWOoFh9xUR1vaNiJq4eZTIuWBJ6KzQS7/+q L7ut6XF+ufjN54He6tcUzCHz7wLRSF5gIk+WWZJmVq2ZWDm5wS9pPlGnyX6XuM2oR9qP H27g== X-Gm-Message-State: AOAM5325jY41R8lInxUY/Pt4niH+sFsYiiYsyGlxU7Tmfe8zwHKR0/gH X28Z4iZjZ2ixAKDKyhwiC/GyTQ== X-Google-Smtp-Source: ABdhPJzpyOZ0frHuXehgPmWm1noxfZg4/0G0SpYwD6kaD5rTrw9wQvLbC4KGmzkG1e9mPkgH9QzcBA== X-Received: by 2002:a17:90b:390a:: with SMTP id ob10mr10382545pjb.110.1643837055792; Wed, 02 Feb 2022 13:24:15 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:f1c4:10b6:b4ef:16e5]) by smtp.gmail.com with ESMTPSA id on9sm7627983pjb.16.2022.02.02.13.24.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 13:24:15 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: pmaliset@codeaurora.org, mka@chromium.org, quic_rjendra@quicinc.com, Shaik Sajida Bhanu , kgodara@codeaurora.org, konrad.dybcio@somainline.org, Sankeerth Billakanti , sibis@codeaurora.org, swboyd@chromium.org, Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 04/14] arm64: dts: qcom: sc7280: Clean up sdc1 / sdc2 pinctrl Date: Wed, 2 Feb 2022 13:23:38 -0800 Message-Id: <20220202132301.v3.4.I79baad7f52351aafb470f8b21a9fa79d7031ad6a@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220202212348.1391534-1-dianders@chromium.org> References: <20220202212348.1391534-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch makes a few improvements to the way that sdc1 / sdc2 pinctrl is specified on sc7280: 1. There's no reason to "group" the sdc pins into one overarching node and there's a downside: we have to replicate the hierarchy in the board device tree files. Let's clean this up. 2. There's really not a lot of reason not to list the "pinctrl" for sdc1 (eMMC) in the SoC dtsi file. These aren't GPIO pins and everyone's going to specify the same pins. 3. Even though it's likely that boards will need to override pinctrl for sdc2 (SD card) to add the card detect GPIO, we can be symmetric and add it to the SoC dsti file. 4. Let's get rid of the word "on" from the normal config and add a "sleep" suffix to the sleep config. This looks cleaner to me. This is intended to be a no-op change but it could plausibly change behavior depending on how the pinctrl code parses things. One thing to note is that "SD card detect" is explicitly listed now as keeping its pull enabled in sleep since we still want to detect card insertions even if the controller is suspended (because no card is inserted). The pinctrl framework likely did this anyway, but it's nice to see it explicit. Signed-off-by: Douglas Anderson --- Changes in v3: - Removed extra blank lines .../qcom/sc7280-herobrine-herobrine-r0.dts | 73 +++++------ arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 91 +++++++------- arch/arm64/boot/dts/qcom/sc7280.dtsi | 117 +++++++++--------- 3 files changed, 133 insertions(+), 148 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts b/a= rch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts index f159b5a6d7ef..918352c097bc 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts @@ -676,9 +676,6 @@ &qupv3_id_1 { &sdhc_1 { status =3D "okay"; =20 - pinctrl-names =3D "default", "sleep"; - pinctrl-0 =3D <&sdc1_on>; - pinctrl-1 =3D <&sdc1_off>; vmmc-supply =3D <&pp2950_l7b>; vqmmc-supply =3D <&pp1800_l19b>; }; @@ -686,9 +683,8 @@ &sdhc_1 { &sdhc_2 { status =3D "okay"; =20 - pinctrl-names =3D "default", "sleep"; - pinctrl-0 =3D <&sdc2_on>; - pinctrl-1 =3D <&sdc2_off>; + pinctrl-0 =3D <&sdc2_clk>, <&sdc2_cmd>, <&sdc2_data>, <&sd_cd>; + pinctrl-1 =3D <&sdc2_clk_sleep>, <&sdc2_cmd_sleep>, <&sdc2_data_sleep>, <= &sd_cd>; vmmc-supply =3D <&pp2950_l9c>; vqmmc-supply =3D <&ppvar_l6c>; =20 @@ -883,47 +879,38 @@ &qup_uart7_rx { bias-pull-up; }; =20 -&sdc1_on { - clk { - bias-disable; - drive-strength =3D <16>; - }; - - cmd { - bias-pull-up; - drive-strength =3D <10>; - }; +&sdc1_clk { + bias-disable; + drive-strength =3D <16>; +}; =20 - data { - bias-pull-up; - drive-strength =3D <10>; - }; +&sdc1_cmd { + bias-pull-up; + drive-strength =3D <10>; +}; =20 - rclk { - bias-pull-down; - }; +&sdc1_data { + bias-pull-up; + drive-strength =3D <10>; }; =20 -&sdc2_on { - clk { - bias-disable; - drive-strength =3D <16>; - }; +&sdc1_rclk { + bias-pull-down; +}; =20 - cmd { - bias-pull-up; - drive-strength =3D <10>; - }; +&sdc2_clk { + bias-disable; + drive-strength =3D <16>; +}; =20 - data { - bias-pull-up; - drive-strength =3D <10>; - }; +&sdc2_cmd { + bias-pull-up; + drive-strength =3D <10>; +}; =20 - sd-cd { - pins =3D "gpio91"; - bias-pull-up; - }; +&sdc2_data { + bias-pull-up; + drive-strength =3D <10>; }; =20 /* PINCTRL - board-specific pinctrl */ @@ -1311,6 +1298,12 @@ qup_uart7_sleep_tx: qup-uart7-sleep-tx { bias-pull-up; }; =20 + sd_cd: sd-cd { + pins =3D "gpio91"; + function =3D "gpio"; + bias-pull-up; + }; + tp_int_odl: tp-int-odl { pins =3D "gpio102"; function =3D "gpio"; diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts= /qcom/sc7280-idp.dtsi index 78da9ac983db..7a987bc9b758 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi @@ -278,10 +278,6 @@ &qupv3_id_1 { &sdhc_1 { status =3D "okay"; =20 - pinctrl-names =3D "default", "sleep"; - pinctrl-0 =3D <&sdc1_on>; - pinctrl-1 =3D <&sdc1_off>; - non-removable; no-sd; no-sdio; @@ -293,9 +289,8 @@ &sdhc_1 { &sdhc_2 { status =3D "okay"; =20 - pinctrl-names =3D "default", "sleep"; - pinctrl-0 =3D <&sdc2_on>; - pinctrl-1 =3D <&sdc2_off>; + pinctrl-0 =3D <&sdc2_clk>, <&sdc2_cmd>, <&sdc2_data>, <&sd_cd>; + pinctrl-1 =3D <&sdc2_clk_sleep>, <&sdc2_cmd_sleep>, <&sdc2_data_sleep>, <= &sd_cd>; =20 vmmc-supply =3D <&vreg_l9c_2p9>; vqmmc-supply =3D <&vreg_l6c_2p9>; @@ -424,6 +419,40 @@ &qup_uart7_rx { bias-pull-up; }; =20 +&sdc1_clk { + bias-disable; + drive-strength =3D <16>; +}; + +&sdc1_cmd { + bias-pull-up; + drive-strength =3D <10>; +}; + +&sdc1_data { + bias-pull-up; + drive-strength =3D <10>; +}; + +&sdc1_rclk { + bias-pull-down; +}; + +&sdc2_clk { + bias-disable; + drive-strength =3D <16>; +}; + +&sdc2_cmd { + bias-pull-up; + drive-strength =3D <10>; +}; + +&sdc2_data { + bias-pull-up; + drive-strength =3D <10>; +}; + &tlmm { bt_en: bt-en { pins =3D "gpio85"; @@ -496,53 +525,17 @@ qup_uart7_sleep_rx: qup-uart7-sleep-rx { bias-pull-up; }; =20 - sw_ctrl: sw-ctrl { - pins =3D "gpio86"; + sd_cd: sd-cd { + pins =3D "gpio91"; function =3D "gpio"; - input-enable; - bias-pull-down; - }; -}; - -&sdc1_on { - clk { - bias-disable; - drive-strength =3D <16>; - }; - - cmd { bias-pull-up; - drive-strength =3D <10>; }; =20 - data { - bias-pull-up; - drive-strength =3D <10>; - }; - - rclk { + sw_ctrl: sw-ctrl { + pins =3D "gpio86"; + function =3D "gpio"; + input-enable; bias-pull-down; }; }; =20 -&sdc2_on { - clk { - bias-disable; - drive-strength =3D <16>; - }; - - cmd { - bias-pull-up; - drive-strength =3D <10>; - }; - - data { - bias-pull-up; - drive-strength =3D <10>; - }; - - sd-cd { - pins =3D "gpio91"; - bias-pull-up; - }; -}; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qco= m/sc7280.dtsi index 40cb414bc377..5b1e23991a6a 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -616,6 +616,9 @@ qfprom: efuse@784000 { =20 sdhc_1: sdhci@7c4000 { compatible =3D "qcom,sc7280-sdhci", "qcom,sdhci-msm-v5"; + pinctrl-names =3D "default", "sleep"; + pinctrl-0 =3D <&sdc1_clk>, <&sdc1_cmd>, <&sdc1_data>, <&sdc1_rclk>; + pinctrl-1 =3D <&sdc1_clk_sleep>, <&sdc1_cmd_sleep>, <&sdc1_data_sleep>,= <&sdc1_rclk_sleep>; status =3D "disabled"; =20 reg =3D <0 0x007c4000 0 0x1000>, @@ -2425,6 +2428,9 @@ apss_merge_funnel_in: endpoint { =20 sdhc_2: sdhci@8804000 { compatible =3D "qcom,sc7280-sdhci", "qcom,sdhci-msm-v5"; + pinctrl-names =3D "default", "sleep"; + pinctrl-0 =3D <&sdc2_clk>, <&sdc2_cmd>, <&sdc2_data>; + pinctrl-1 =3D <&sdc2_clk_sleep>, <&sdc2_cmd_sleep>, <&sdc2_data_sleep>; status =3D "disabled"; =20 reg =3D <0 0x08804000 0 0x1000>; @@ -3943,81 +3949,74 @@ qup_uart15_rx: qup-uart15-rx { function =3D "qup17"; }; =20 - sdc1_on: sdc1-on { - clk { - pins =3D "sdc1_clk"; - }; + sdc1_clk: sdc1-clk { + pins =3D "sdc1_clk"; + }; =20 - cmd { - pins =3D "sdc1_cmd"; - }; + sdc1_cmd: sdc1-cmd { + pins =3D "sdc1_cmd"; + }; =20 - data { - pins =3D "sdc1_data"; - }; + sdc1_data: sdc1-data { + pins =3D "sdc1_data"; + }; =20 - rclk { - pins =3D "sdc1_rclk"; - }; + sdc1_rclk: sdc1-rclk { + pins =3D "sdc1_rclk"; }; =20 - sdc1_off: sdc1-off { - clk { - pins =3D "sdc1_clk"; - drive-strength =3D <2>; - bias-bus-hold; - }; + sdc1_clk_sleep: sdc1-clk-sleep { + pins =3D "sdc1_clk"; + drive-strength =3D <2>; + bias-bus-hold; + }; =20 - cmd { - pins =3D "sdc1_cmd"; - drive-strength =3D <2>; - bias-bus-hold; - }; + sdc1_cmd_sleep: sdc1-cmd-sleep { + pins =3D "sdc1_cmd"; + drive-strength =3D <2>; + bias-bus-hold; + }; =20 - data { - pins =3D "sdc1_data"; - drive-strength =3D <2>; - bias-bus-hold; - }; + sdc1_data_sleep: sdc1-data-sleep { + pins =3D "sdc1_data"; + drive-strength =3D <2>; + bias-bus-hold; + }; =20 - rclk { - pins =3D "sdc1_rclk"; - bias-bus-hold; - }; + sdc1_rclk_sleep: sdc1-rclk-sleep { + pins =3D "sdc1_rclk"; + drive-strength =3D <2>; + bias-bus-hold; }; =20 - sdc2_on: sdc2-on { - clk { - pins =3D "sdc2_clk"; - }; + sdc2_clk: sdc2-clk { + pins =3D "sdc2_clk"; + }; =20 - cmd { - pins =3D "sdc2_cmd"; - }; + sdc2_cmd: sdc2-cmd { + pins =3D "sdc2_cmd"; + }; =20 - data { - pins =3D "sdc2_data"; - }; + sdc2_data: sdc2-data { + pins =3D "sdc2_data"; }; =20 - sdc2_off: sdc2-off { - clk { - pins =3D "sdc2_clk"; - drive-strength =3D <2>; - bias-bus-hold; - }; + sdc2_clk_sleep: sdc2-clk-sleep { + pins =3D "sdc2_clk"; + drive-strength =3D <2>; + bias-bus-hold; + }; =20 - cmd { - pins =3D"sdc2_cmd"; - drive-strength =3D <2>; - bias-bus-hold; - }; + sdc2_cmd_sleep: sdc2-cmd-sleep { + pins =3D "sdc2_cmd"; + drive-strength =3D <2>; + bias-bus-hold; + }; =20 - data { - pins =3D"sdc2_data"; - drive-strength =3D <2>; - bias-bus-hold; - }; + sdc2_data_sleep: sdc2-data-sleep { + pins =3D "sdc2_data"; + drive-strength =3D <2>; + bias-bus-hold; }; }; =20 --=20 2.35.0.rc2.247.g8bbb082509-goog From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70865C433F5 for ; Wed, 2 Feb 2022 21:24:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347608AbiBBVYb (ORCPT ); Wed, 2 Feb 2022 16:24:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347522AbiBBVYR (ORCPT ); Wed, 2 Feb 2022 16:24:17 -0500 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7161C06173B for ; Wed, 2 Feb 2022 13:24:17 -0800 (PST) Received: by mail-pf1-x432.google.com with SMTP id a8so412858pfa.6 for ; Wed, 02 Feb 2022 13:24:17 -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=ERootrk4zEfHUOhgfH+rtttwTculem/Ci38KL1ItthA=; b=kTFPH7ge3u8ih6rXPvUXkPrD716e8ZuO6zMoUv2PUu6ouO8/1Wyf3VttthKbKX/xnC Ubo2iv6gfgibz21/E0sZOk3M1bTFk6d/myXdcgvBSNCBTof66XJa/Ol0AbJLy6jSWw4l 8j+sfBdoH5OnlJdU9qCARzJlfCLbO3KHXbJlY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ERootrk4zEfHUOhgfH+rtttwTculem/Ci38KL1ItthA=; b=kJP6n6Zr26CwmMCDP18M86mnyA8E//gqO1eNESmTXWCboe/wkBDMehRu18L1YVsUb4 OlWKmHdYKKsc919Vh8reTcPgTFwzKHs1FBVXOUF06I32J2z7jSh5S+dDDR05D+VWZYv+ 3Ohc141jzkZsme50jpzetZk//qBV0WHI1cll6IRYUF977MxzJQdkTudL/+a9cds7UT1e VrIR4Ta4xqQ+DPuy+cmfre24zg566jBA6onpm/9JlMuh9pTHh87Yhdc56ZVt+Z/Ql6h/ bDlHWCuwA/AhZ9yYBoA2zKgK3Qzu7M9O9HTdwR63FuMd1lxaLf2Nl+mDcMzwFqEarvyH BVNA== X-Gm-Message-State: AOAM532HkG5zqZAFGq3cabPEQEojtDI/nqLQvIax0CiAwDgTP418wOmv ghcKndhxw42xNQY23xtDg7tn3Q== X-Google-Smtp-Source: ABdhPJzGt9IZqVcKjMM8YZfcWuKOpKUaKOweWeXNxVqlnJLPq3Hl62vZ/F/iW15Vou7b8cOhjD3irg== X-Received: by 2002:a63:5908:: with SMTP id n8mr25626217pgb.390.1643837057379; Wed, 02 Feb 2022 13:24:17 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:f1c4:10b6:b4ef:16e5]) by smtp.gmail.com with ESMTPSA id on9sm7627983pjb.16.2022.02.02.13.24.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 13:24:16 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: pmaliset@codeaurora.org, mka@chromium.org, quic_rjendra@quicinc.com, Shaik Sajida Bhanu , kgodara@codeaurora.org, konrad.dybcio@somainline.org, Sankeerth Billakanti , sibis@codeaurora.org, swboyd@chromium.org, Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 05/14] arm64: dts: qcom: sc7280-idp: No need for "input-enable" on sw_ctrl Date: Wed, 2 Feb 2022 13:23:39 -0800 Message-Id: <20220202132301.v3.5.Ibaf8a803802beb089cc6266b37e6156cff3ddaec@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220202212348.1391534-1-dianders@chromium.org> References: <20220202212348.1391534-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Specifying "input-enable" on a MSM GPIO is a no-op for the most part. The only thing it really does is to explicitly force the output of a GPIO to be disabled right at the point of a pinctrl transition. We don't need to do this and we don't typically specify "input-enable" unless there's a good reason to. Remove it. Signed-off-by: Douglas Anderson Reviewed-by: Matthias Kaehlcke --- (no changes since v1) arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts= /qcom/sc7280-idp.dtsi index 7a987bc9b758..23e656e51904 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi @@ -534,7 +534,6 @@ sd_cd: sd-cd { sw_ctrl: sw-ctrl { pins =3D "gpio86"; function =3D "gpio"; - input-enable; bias-pull-down; }; }; --=20 2.35.0.rc2.247.g8bbb082509-goog From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E63AC433FE for ; Wed, 2 Feb 2022 21:24:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347578AbiBBVY1 (ORCPT ); Wed, 2 Feb 2022 16:24:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347507AbiBBVYT (ORCPT ); Wed, 2 Feb 2022 16:24:19 -0500 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 404D1C06173B for ; Wed, 2 Feb 2022 13:24:19 -0800 (PST) Received: by mail-pj1-x1030.google.com with SMTP id d5so514575pjk.5 for ; Wed, 02 Feb 2022 13:24:19 -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=2cXStUZV/DOm3TsqdV/whSwf7t4bjeXpzaBygAmoNVI=; b=JmprhX1Jr++7BENYz/EHYTM042CmJVN+I81DJ7dtcITklD0jC8p5KI6VqOhO5xHfiA TWl9xcD8CGCCy6a9iPhMtG1ePob1sZ+tl3AfCzq7qreRqxhn/SW6Y2x8G2nheRkpV68e FCxGn1rAjpYm0lrdo3yEmK4TEvWzAMVOXJlzw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2cXStUZV/DOm3TsqdV/whSwf7t4bjeXpzaBygAmoNVI=; b=zqKt5OoxJtwIUvXpl08qDwgxUDByKiIAskgUDtnBKtZdkvYLbtezIeWzPWluNcJQ4d ndXKEFFoVZoS70+3aJzMYS8s/SQWT/VR8r6JDKMVWzkXpqhQ+i2W1fB2Xfr8RwQENPeP KXOjN0qv6fkg1AONZ/Bq5onpUHMzmK7+vaPSF/SYyDOmJq45CRZrZpsS9MuybcunVjAl GAu9QUPf4dpoabBfg8n7ZZ96skfBFBKqYHwnem2djOhqEDhrQhF9P4vtrKtKKn1r1V7S TV0GVE54ztT5ss/yQT8n4L9C7tVw+IOlAcsH8qNWhN3kuvEl5NnPtn/gmlTAOZ6+vDY5 rOBQ== X-Gm-Message-State: AOAM533SkMf1DtZmpLDHaStz4tAvZ1dS+UiL/dh13li3UlqoIZU3h11N EwDPwMjpe9+jxDS8IfLVI0B9GA== X-Google-Smtp-Source: ABdhPJwEvXg92MOi6sLLMMex8dQa5S8kCQnyi684dY54hTxZsaRcevI7hk93odxZwt2OoGBOC86imQ== X-Received: by 2002:a17:902:ed44:: with SMTP id y4mr33302728plb.152.1643837058791; Wed, 02 Feb 2022 13:24:18 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:f1c4:10b6:b4ef:16e5]) by smtp.gmail.com with ESMTPSA id on9sm7627983pjb.16.2022.02.02.13.24.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 13:24:18 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: pmaliset@codeaurora.org, mka@chromium.org, quic_rjendra@quicinc.com, Shaik Sajida Bhanu , kgodara@codeaurora.org, konrad.dybcio@somainline.org, Sankeerth Billakanti , sibis@codeaurora.org, swboyd@chromium.org, Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 06/14] arm64: dts: qcom: sc7280: Fix sort order of dp_hot_plug_det / pcie1_clkreq_n Date: Wed, 2 Feb 2022 13:23:40 -0800 Message-Id: <20220202132301.v3.6.I874c6f2a62b7922a33e10d390a8983219a76250b@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220202212348.1391534-1-dianders@chromium.org> References: <20220202212348.1391534-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The two nodes were mis-sorted. Reorder. This is a no-op change. Signed-off-by: Douglas Anderson --- Changes in v3: - ("Fix sort order of dp_hot_plug_det") new for v3. arch/arm64/boot/dts/qcom/sc7280.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qco= m/sc7280.dtsi index 5b1e23991a6a..4d5892411a38 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -3271,6 +3271,12 @@ tlmm: pinctrl@f100000 { gpio-ranges =3D <&tlmm 0 0 175>; wakeup-parent =3D <&pdc>; =20 + dp_hot_plug_det: dp-hot-plug-det { + pins =3D "gpio47"; + function =3D "dp_hot"; + bias-disable; + }; + pcie1_clkreq_n: pcie1-clkreq-n { pins =3D "gpio79"; function =3D "pcie1_clkreqn"; @@ -3278,12 +3284,6 @@ pcie1_clkreq_n: pcie1-clkreq-n { bias-pull-up; }; =20 - dp_hot_plug_det: dp-hot-plug-det { - pins =3D "gpio47"; - function =3D "dp_hot"; - bias-disable; - }; - qspi_clk: qspi-clk { pins =3D "gpio14"; function =3D "qspi_clk"; --=20 2.35.0.rc2.247.g8bbb082509-goog From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 382DDC433F5 for ; Wed, 2 Feb 2022 21:24:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238948AbiBBVYg (ORCPT ); Wed, 2 Feb 2022 16:24:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347536AbiBBVYU (ORCPT ); Wed, 2 Feb 2022 16:24:20 -0500 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7418C06173D for ; Wed, 2 Feb 2022 13:24:20 -0800 (PST) Received: by mail-pf1-x432.google.com with SMTP id i30so405065pfk.8 for ; Wed, 02 Feb 2022 13:24:20 -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=5qCBCKfP+j2HtZn2zMmVI6QfVCuXgmfkA60ibxCLXgs=; b=f3nZ1EzYLBy7tnJJ+R0jdFG+yS+atHgKHNCLxveKGXKQiMOlgQEaUjZU6xlVij4pb/ W7q3Hg8Qr6HevsZXJulOBWMr6yF2kxt4BmmPVbKF/B8ax/QmFiBF8NuST5CArY/i0IgB +EF4n1qgauGccnEerahlqdTneqwozLQiwcKlM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5qCBCKfP+j2HtZn2zMmVI6QfVCuXgmfkA60ibxCLXgs=; b=4glOj5ch4OS4Cr0h1OmWZ8FVmNNGgNQgC/+lxOl+eKAQ8tZRVfem9FV7m0Hee3E0HS hQQWP1awSBE110msrmoUSEc9dGUdnnghjn94fgyIUw2GQw4k9oFUhAG2in6cvR2s1huA +J9RUJ1dFh6e/zUQldoz59yRNs4+Uv/fP5zjg007ijSad0G27StT4UDxB3kfHat21Rf+ Xv2DPoHX0LdnfDiTld5pxgdK4DhHIYRkM4zmNBFNP/B69S5bgjgf2tC/0qVHyozwtkLT c/Fsv69EjiJWEr7OUFCZKiklZSpbYeRilS6egzgKitP1JNXdZqTkHtcOeyFIMMY3oJIP ioAQ== X-Gm-Message-State: AOAM532Ie43b+ULLcIn5EmgU+pzGh94mM5g/qV9vNWALJOmmNMS+DrOd dtRyA1s0oOgvO7YLiW8/MjeWSA== X-Google-Smtp-Source: ABdhPJwPT54MjvO3Gz+8X9q/NBFTjhdeFn3zIeltngAbKTcjcpYU137ZDJA3wRFQRbOPxYWXylY52A== X-Received: by 2002:a05:6a00:130a:: with SMTP id j10mr30426747pfu.32.1643837060244; Wed, 02 Feb 2022 13:24:20 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:f1c4:10b6:b4ef:16e5]) by smtp.gmail.com with ESMTPSA id on9sm7627983pjb.16.2022.02.02.13.24.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 13:24:19 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: pmaliset@codeaurora.org, mka@chromium.org, quic_rjendra@quicinc.com, Shaik Sajida Bhanu , kgodara@codeaurora.org, konrad.dybcio@somainline.org, Sankeerth Billakanti , sibis@codeaurora.org, swboyd@chromium.org, Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 07/14] arm64: dts: qcom: sc7280: Add edp_out port and HPD lines Date: Wed, 2 Feb 2022 13:23:41 -0800 Message-Id: <20220202132301.v3.7.Ic84bb69c45be2fccf50e3bd17b845fe20eec624c@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220202212348.1391534-1-dianders@chromium.org> References: <20220202212348.1391534-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Like dp_out, we should have defined edp_out in sc7280.dtsi so we don't need to do this in the board files. Like dp_hot_plug_det, we should define edp_hot_plug_det in sc7280.dtsi. We should set the default pinctrl for edp_hot_plug_det in sc7280.dtsi. NOTE: this is _unlike_ the dp_hot_plug_det. It is reasonable that in some boards the dedicated DP Hot Plug Detect will not be hooked up in favor of Type C mechanisms. This is unlike eDP where the Hot Plug Detect line (which functions as "panel ready" in eDP) is highly likely to be used by boards. Signed-off-by: Douglas Anderson --- Changes in v3: - ("Add edp_out port and HPD lines") new for v3. arch/arm64/boot/dts/qcom/sc7280.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qco= m/sc7280.dtsi index 4d5892411a38..3f9837921c17 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -3010,6 +3010,8 @@ mdss_dsi_phy: phy@ae94400 { =20 mdss_edp: edp@aea0000 { compatible =3D "qcom,sc7280-edp"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&edp_hot_plug_det>; =20 reg =3D <0 0xaea0000 0 0x200>, <0 0xaea0200 0 0x200>, @@ -3052,12 +3054,18 @@ mdss_edp: edp@aea0000 { ports { #address-cells =3D <1>; #size-cells =3D <0>; + port@0 { reg =3D <0>; edp_in: endpoint { remote-endpoint =3D <&dpu_intf5_out>; }; }; + + port@1 { + reg =3D <1>; + edp_out: endpoint { }; + }; }; =20 edp_opp_table: opp-table { @@ -3277,6 +3285,11 @@ dp_hot_plug_det: dp-hot-plug-det { bias-disable; }; =20 + edp_hot_plug_det: edp-hot-plug-det { + pins =3D "gpio60"; + function =3D "edp_hot"; + }; + pcie1_clkreq_n: pcie1-clkreq-n { pins =3D "gpio79"; function =3D "pcie1_clkreqn"; --=20 2.35.0.rc2.247.g8bbb082509-goog From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8AE53C4332F for ; Wed, 2 Feb 2022 21:24:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347570AbiBBVYt (ORCPT ); Wed, 2 Feb 2022 16:24:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347567AbiBBVYZ (ORCPT ); Wed, 2 Feb 2022 16:24:25 -0500 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3FB97C06174E for ; Wed, 2 Feb 2022 13:24:22 -0800 (PST) Received: by mail-pf1-x42a.google.com with SMTP id a19so421428pfx.4 for ; Wed, 02 Feb 2022 13:24:22 -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=Cn5bTxD+y0u/cuoyspIF5KY9HBsgsURj9OKkTRdQlHM=; b=SNurvubUTpRw3jzJLUyEpOcSnGu3nC0+AdjsMxlqqRXoBD3zWOBMjvfFONFTi6JaQU yes2UUkv+fyfGE3KDXCTqUGNQlzVoRNqF9RjMBytTsNSDsLqGiFbpl/gxYhTT5bs0R2y xYPK8kMKrBTPYhmML8aT1i61Zwfk6+eLXzp2c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Cn5bTxD+y0u/cuoyspIF5KY9HBsgsURj9OKkTRdQlHM=; b=0h/U5YRxvXpZ6AvHS4qxSo5Bsj+T7BohvB5tEwPggek1qrBo0NPjeaszQ5UiIXH7S/ 0oYr9wKXbVy/1TgJZyXa1kUN9P/nlVmOD3AgYvit51/j8WED1o6EOfaMje20lNyGaTEW 5jjJXJ1NgFmeShyoDVkUdyAoST07tQSnq7XPpKcEYHbTAPLPA6kcKUN/miYXE1lCOJ6d 889ZpKrUTdjevcNzAr9cbPWCwA2ZN2h/YWyWZmyGIiFHU6G+GV9/wYtMBozQ2/9svkp4 ydf1FamJlBLmwEpE2DQslbqt0/DM8ZOQabX4AA8DB5YifxEq4pcVbt9GrcOw/FzWPLZ+ lbFg== X-Gm-Message-State: AOAM530epFO2pncuoI/U2VcX7YL2KtWY7OQxLDf3SJMnnQQDD7gO7DZT 6fZR9rr+0b5zFNVKqZkjJEC7zQ== X-Google-Smtp-Source: ABdhPJzxTbAGRg1diy8LkKtzJUjrTUGZT77WrRaGr4wMKnEH/SV3zdH93xFEfOcrDNhBgXtzcW6eiw== X-Received: by 2002:a62:1643:: with SMTP id 64mr31080879pfw.55.1643837061733; Wed, 02 Feb 2022 13:24:21 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:f1c4:10b6:b4ef:16e5]) by smtp.gmail.com with ESMTPSA id on9sm7627983pjb.16.2022.02.02.13.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 13:24:21 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: pmaliset@codeaurora.org, mka@chromium.org, quic_rjendra@quicinc.com, Shaik Sajida Bhanu , kgodara@codeaurora.org, konrad.dybcio@somainline.org, Sankeerth Billakanti , sibis@codeaurora.org, swboyd@chromium.org, Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 08/14] arm64: dts: qcom: sc7280: Move pcie1_clkreq pull / drive str to boards Date: Wed, 2 Feb 2022 13:23:42 -0800 Message-Id: <20220202132301.v3.8.Iffff0c12440a047212a164601e637b03b9d2fc78@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220202212348.1391534-1-dianders@chromium.org> References: <20220202212348.1391534-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Pullups and drive strength don't belong in the SoC dtsi file. Move to the board file. Signed-off-by: Douglas Anderson --- Changes in v3: - ("Move pcie1_clkreq pull / drive str to boards") new for v3. arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts | 5 +++++ arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 5 +++++ arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 -- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts b/a= rch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts index 918352c097bc..82c3c8f0342b 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts @@ -826,6 +826,11 @@ &usb_2_hsphy { =20 /* PINCTRL - additions to nodes defined in sc7280.dtsi */ =20 +&pcie1_clkreq_n { + bias-pull-up; + drive-strength =3D <2>; +}; + &qspi_cs0 { bias-disable; }; diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts= /qcom/sc7280-idp.dtsi index 23e656e51904..6e20e8c07402 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi @@ -366,6 +366,11 @@ key_vol_up_default: key-vol-up-default { }; }; =20 +&pcie1_clkreq_n { + bias-pull-up; + drive-strength =3D <2>; +}; + &qspi_cs0 { bias-disable; }; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qco= m/sc7280.dtsi index 3f9837921c17..a2e3aa6ecdd3 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -3293,8 +3293,6 @@ edp_hot_plug_det: edp-hot-plug-det { pcie1_clkreq_n: pcie1-clkreq-n { pins =3D "gpio79"; function =3D "pcie1_clkreqn"; - drive-strength =3D <2>; - bias-pull-up; }; =20 qspi_clk: qspi-clk { --=20 2.35.0.rc2.247.g8bbb082509-goog From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F267C433EF for ; Wed, 2 Feb 2022 21:25:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347552AbiBBVZJ (ORCPT ); Wed, 2 Feb 2022 16:25:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347630AbiBBVYh (ORCPT ); Wed, 2 Feb 2022 16:24:37 -0500 Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADCD1C061759 for ; Wed, 2 Feb 2022 13:24:23 -0800 (PST) Received: by mail-pg1-x52a.google.com with SMTP id s16so526771pgs.13 for ; Wed, 02 Feb 2022 13:24:23 -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=cYHfz0BsCMUpTXZNkgUYz8ce27VEmp7wwarvZ2CQUxk=; b=dYx+ZyVUfAx/Hz+swtu1BWE2GpqHz//uH35gVg9SpGdIogWsDrD+Zw+KMINXb7Zi1k 4ikg38ff6XUQFN6OQRInEpe++fuQN4xmTUeePB1NmZmNzJCY3EBtd/a1kz7NfOyaj/rg jQavdv0QjlWy8LG+FCZjqxDt0Q4d10ZlWTKns= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cYHfz0BsCMUpTXZNkgUYz8ce27VEmp7wwarvZ2CQUxk=; b=YRK1gMO4wPcssNRnMa8/PUZ1v2wJ2gpOKlrcZB6M9a41UYMmm2t+V/ni0lQuuxtAi3 Ngxy0/Gri/PwMC9omei0MnOATKchSLjdROdhZcfUoZ4vLPkIVp5f/Q70Xb58MgKb1eQT MVlc11MtMNFTuDE3MDOcsxW5dty3yX1i72ZYI0r0STvgN7txmVemoeX4yM2mb2egOJ1W R1uT1qD/UNU8B3sM6ZwfNYQi5FV9oaK7+5cht+0wR0ylIV2Kjxa3i7455xm/rQst1tLI 9q4pYY1Cisi/u1IEom3vVnG1BHKFV/UL9qHbwnoTZRxF/2hKxVgSB8w8xI0TADWcODKq aYTg== X-Gm-Message-State: AOAM532Ry/7kZrIGyQed0mkBRQFxmfBb9OdaHBHgX6psI5ogq0lbzkr8 gqpf8CsoJT3n5Nq3HuKTuTGDyw== X-Google-Smtp-Source: ABdhPJxbZKK+JzVp1VSiV8IMwDjN+ULU1FWL7BaKzFoHZemWnB0NC0mW43BobL3//Mz9CuCpR7Fzpg== X-Received: by 2002:a05:6a00:26e9:: with SMTP id p41mr3304516pfw.1.1643837063157; Wed, 02 Feb 2022 13:24:23 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:f1c4:10b6:b4ef:16e5]) by smtp.gmail.com with ESMTPSA id on9sm7627983pjb.16.2022.02.02.13.24.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 13:24:22 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: pmaliset@codeaurora.org, mka@chromium.org, quic_rjendra@quicinc.com, Shaik Sajida Bhanu , kgodara@codeaurora.org, konrad.dybcio@somainline.org, Sankeerth Billakanti , sibis@codeaurora.org, swboyd@chromium.org, Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 09/14] arm64: dts: qcom: sc7280: Disable pull from pcie1_clkreq Date: Wed, 2 Feb 2022 13:23:43 -0800 Message-Id: <20220202132301.v3.9.I5f367dcce8107f2186b2aad4aef0dfcfafa034b9@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220202212348.1391534-1-dianders@chromium.org> References: <20220202212348.1391534-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" I believe that the PCIe clkreq pin is an output. That means we shouldn't have a pull enabled for it. Turn it off. Signed-off-by: Douglas Anderson --- Changes in v3: - ("sc7280-idp: Disable pull from pcie1_clkreq") new for v3. arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts | 2 +- arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts b/a= rch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts index 82c3c8f0342b..3c5aab225748 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts @@ -827,7 +827,7 @@ &usb_2_hsphy { /* PINCTRL - additions to nodes defined in sc7280.dtsi */ =20 &pcie1_clkreq_n { - bias-pull-up; + bias-disable; drive-strength =3D <2>; }; =20 diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts= /qcom/sc7280-idp.dtsi index 6e20e8c07402..9140dca3b72a 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi @@ -367,7 +367,7 @@ key_vol_up_default: key-vol-up-default { }; =20 &pcie1_clkreq_n { - bias-pull-up; + bias-disable; drive-strength =3D <2>; }; =20 --=20 2.35.0.rc2.247.g8bbb082509-goog From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5122C43217 for ; Wed, 2 Feb 2022 21:25:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347542AbiBBVZF (ORCPT ); Wed, 2 Feb 2022 16:25:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347669AbiBBVYp (ORCPT ); Wed, 2 Feb 2022 16:24:45 -0500 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27518C06175E for ; Wed, 2 Feb 2022 13:24:25 -0800 (PST) Received: by mail-pg1-x531.google.com with SMTP id h125so569491pgc.3 for ; Wed, 02 Feb 2022 13:24:25 -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=ByszmS3++VzU56DysBqUHdS0730VZ9qlutiOkG62SSc=; b=nR2MvYfzs5o5IAQK/n8ImikISS87gNJVo5eSON5hLyblMqv0Z0NdUA6xvk1zR4Og7r uhuAkK8C4ctlhY4Ta2kFhceB1NHDF6ilUOsM3X9CfGp84hCMXujqEYTQ4lyN2qDClMKN YpZ+IG5EWjEfwmazwvX9m9iUzj/oxE3OBu1KM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ByszmS3++VzU56DysBqUHdS0730VZ9qlutiOkG62SSc=; b=h0YAL7Sl8YYAOntfPS+O1n3UwLySTg1PMWlAxuwFyFJpY8vp776gauhUJr5jC4O1Fh US+4dRHhMaZG4vgiGSaHFPQTY1DnDC01qEu1VoyAH8lXJlzHlLjvZUTKHPO3nA3UqPgS nYm2kg6OQkZkawhUEotux2x4KaTAOtItOqFLIubx2y5EsgGULFWFbTpH2hMQzOXBN1mU YbrDbBvbloN3qaLOrzwCPQ/fuO+iyN0wQM6T/Kc7HX1gXSXBuBqWvDXbP3ltXmKo8hgh QifrIb7TCHorc3uWIFjqea3Ji7CjEyljoGH0qGaDmq+jKELyzjOKdNdX5DqWHsNLbtBU jbPg== X-Gm-Message-State: AOAM530ZE0HhgoZrtmGzAwQAYg0u+BuZb7Bq/zkSiKhGp1xtTFO5R/L4 jH7EO/62RKF2adXvn8BjN6OVcQ== X-Google-Smtp-Source: ABdhPJzVsb8lfDnT0uBdj+He/AFpZcfXHtpW/Ppb3qs9pGrZ/r77umcD1G4sWWnwf/2ezbIPN9s0zw== X-Received: by 2002:a63:2bc5:: with SMTP id r188mr13767481pgr.363.1643837064608; Wed, 02 Feb 2022 13:24:24 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:f1c4:10b6:b4ef:16e5]) by smtp.gmail.com with ESMTPSA id on9sm7627983pjb.16.2022.02.02.13.24.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 13:24:24 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: pmaliset@codeaurora.org, mka@chromium.org, quic_rjendra@quicinc.com, Shaik Sajida Bhanu , kgodara@codeaurora.org, konrad.dybcio@somainline.org, Sankeerth Billakanti , sibis@codeaurora.org, swboyd@chromium.org, Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 10/14] arm64: dts: qcom: sc7280: Move dp_hot_plug_det pull from SoC dtsi file Date: Wed, 2 Feb 2022 13:23:44 -0800 Message-Id: <20220202132301.v3.10.Id346b23642f91e16d68d75f44bcdb5b9fbd155ea@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220202212348.1391534-1-dianders@chromium.org> References: <20220202212348.1391534-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Pulls should be in the board files, not in the SoC dtsi file. Remove. Even though the sc7280 boards don't currently refer to dp_hot_plug_det, let's re-add the pulls there just to keep this as a no-op change. If boards don't need this / don't want it later then we can remove it from them. Signed-off-by: Douglas Anderson --- Changes in v3: - ("Remove dp_hot_plug_det pull from SoC dtsi file") new for v3. arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts | 4 ++++ arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 4 ++++ arch/arm64/boot/dts/qcom/sc7280.dtsi | 1 - 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts b/a= rch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts index 3c5aab225748..bdc3f341ecf6 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts @@ -826,6 +826,10 @@ &usb_2_hsphy { =20 /* PINCTRL - additions to nodes defined in sc7280.dtsi */ =20 +&dp_hot_plug_det { + bias-disable; +}; + &pcie1_clkreq_n { bias-disable; drive-strength =3D <2>; diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts= /qcom/sc7280-idp.dtsi index 9140dca3b72a..325f50925451 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi @@ -355,6 +355,10 @@ bluetooth: bluetooth { =20 /* PINCTRL - additions to nodes defined in sc7280.dtsi */ =20 +&dp_hot_plug_det { + bias-disable; +}; + &pm7325_gpios { key_vol_up_default: key-vol-up-default { pins =3D "gpio6"; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qco= m/sc7280.dtsi index a2e3aa6ecdd3..1776523e169a 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -3282,7 +3282,6 @@ tlmm: pinctrl@f100000 { dp_hot_plug_det: dp-hot-plug-det { pins =3D "gpio47"; function =3D "dp_hot"; - bias-disable; }; =20 edp_hot_plug_det: edp-hot-plug-det { --=20 2.35.0.rc2.247.g8bbb082509-goog From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7089CC433FE for ; Wed, 2 Feb 2022 21:25:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347586AbiBBVZD (ORCPT ); Wed, 2 Feb 2022 16:25:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347680AbiBBVYr (ORCPT ); Wed, 2 Feb 2022 16:24:47 -0500 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5A9BC061401 for ; Wed, 2 Feb 2022 13:24:26 -0800 (PST) Received: by mail-pf1-x42e.google.com with SMTP id i17so384952pfq.13 for ; Wed, 02 Feb 2022 13:24:26 -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=QSQlZvmcfCUBtm2+1cc0/YI7EprizXuuLYmIUMgnJ1M=; b=aIwkVjBccvew/dDC0tK8r+6HvM9pbDPy/F/NTIwKQJAj5sMk4Gc71ec4/KSRn/Nznw g3QkUWrXL8l//0rXWVbGFu8idgrevedB4BZ87PnimGoJCFNuJwVXEGCBtJ8QKEhIc26q wP3xGCxgBwYEUIAUU6jvYmcS6WVY7KcroNQlc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QSQlZvmcfCUBtm2+1cc0/YI7EprizXuuLYmIUMgnJ1M=; b=SH1YnFDN2voEdxkgXorP19WXkwQ1iph/150bU29m3hfCoEK58V8jfg9wujrLmFS+Iu 5TUT5W2YWJpL36CL9qhnhKLZfwpEb2o1/eAGu6L/o7Ay09ZIT13/I016U4PZrDDl3T1K IEtCejJ1QndDj4Pa99QPzq12vdWeFMjwfyffQ5BIIc3jOMsFqs/CXrVsCZuW8+a70ujq 3Ilr2Ns7Ila3QQGBPz6HakV8eTAYd/ouCsZoihRDkU+jQF7889S8gYC6FoIj47uLfeO1 eD2nIVaMGBeYVeqgBn9gV5yjUbai749JDpU2e5msfZvCfelzAcoDgym91TcI7qCCBFpt Cftw== X-Gm-Message-State: AOAM532ypKnjyr3Fc+OoEJ4sNDzko9D0xtd0wWxalJmqdnkAXQdgiNXF Fb7O0Gc5kr3cGpEofMETB1Rqpg== X-Google-Smtp-Source: ABdhPJxOSvm1ORQ5ZJ7OP5XJCoTg2tk65Q/XaLvG6ggqU47X2hPk6pzL+R3Xrc7ROOeCOlcT33ITaw== X-Received: by 2002:a63:85c3:: with SMTP id u186mr25500220pgd.199.1643837066067; Wed, 02 Feb 2022 13:24:26 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:f1c4:10b6:b4ef:16e5]) by smtp.gmail.com with ESMTPSA id on9sm7627983pjb.16.2022.02.02.13.24.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 13:24:25 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: pmaliset@codeaurora.org, mka@chromium.org, quic_rjendra@quicinc.com, Shaik Sajida Bhanu , kgodara@codeaurora.org, konrad.dybcio@somainline.org, Sankeerth Billakanti , sibis@codeaurora.org, swboyd@chromium.org, Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 11/14] arm64: dts: qcom: sc7280: Add a blank line in the dp node Date: Wed, 2 Feb 2022 13:23:45 -0800 Message-Id: <20220202132301.v3.11.Iecb7267402e697a5cfef4cd517116ea5b308ac9e@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220202212348.1391534-1-dianders@chromium.org> References: <20220202212348.1391534-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" It's weird that there's a blank line between the two port nodes but not between the attributes and the first port node. Add an extra blank line to make it look right. Signed-off-by: Douglas Anderson --- Changes in v3: - ("Add a blank line in the dp node") new for v3. arch/arm64/boot/dts/qcom/sc7280.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qco= m/sc7280.dtsi index 1776523e169a..618ae0407cd6 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -3147,6 +3147,7 @@ mdss_dp: displayport-controller@ae90000 { ports { #address-cells =3D <1>; #size-cells =3D <0>; + port@0 { reg =3D <0>; dp_in: endpoint { --=20 2.35.0.rc2.247.g8bbb082509-goog From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E84DEC433F5 for ; Wed, 2 Feb 2022 21:25:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347663AbiBBVZV (ORCPT ); Wed, 2 Feb 2022 16:25:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347598AbiBBVYu (ORCPT ); Wed, 2 Feb 2022 16:24:50 -0500 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3F52C061768 for ; Wed, 2 Feb 2022 13:24:28 -0800 (PST) Received: by mail-pj1-x102c.google.com with SMTP id s61-20020a17090a69c300b001b4d0427ea2so8030130pjj.4 for ; Wed, 02 Feb 2022 13:24:28 -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=32AK3/nbQ2wluuPA+KN1m1rxxs+zJo0RWaXOCVWGZjo=; b=JhV0RtFfEpD1e3uuR/1qwujmmpeNPktYP+BzfCrg9C2Z+KnioGDcmQNZMMPjljP44Q jssIjvNRt7nIXgz157lrRfKsIYSzWmLxqvYCM1yl9adMffeLXrsSyXsgyHeUpX7xbK3+ QGwHxHSPNg9VNvO7KiDxJkN3wV4ClCG0pnWLA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=32AK3/nbQ2wluuPA+KN1m1rxxs+zJo0RWaXOCVWGZjo=; b=pPoCrJkx9cyymJcTnlO4CCGyNZjXFzyFp/QTXJAlOQQLcRKrk9m8fugi4IoSiXyvhg zMjVm41VdtScq6+RjrO/bg+e9TiBE1nBazjcBcZLPZ5PFkohTTZk6j9YwWAFq690fP9C HF5sAaO4CyoCnyT40XpzRZ3UtNTbgdAE+4jjFuw9SARE3PdoqlkhJEBWW9uW475wfNF8 x4xVCIvp+gVgPk+oor1SlRUSZQjudc1UVS0NEyueiZpVRyp3h8yXR7epePq/P4wGM3XC BaQS9KG4P8P6pJCEf4t3jiM3JYDbebu2Dnu9iIyL8lNC1hN35bIBvEvsu9Riw0O2AS06 L30Q== X-Gm-Message-State: AOAM532nUNaSXfTBeQzuBwVepxHqEaJnMBld3HtR+S5I2DlDBCrcYlVV 5Rp3Vbq9DZ8+wYVThDSyMsiNgg== X-Google-Smtp-Source: ABdhPJz2Y8ljUEpNEX3o3mxO+nHQShL2tEEgNRYdUirI0+fEaiiXW6be4el1JyWdnkzvx5Yzwi+PiA== X-Received: by 2002:a17:90a:5407:: with SMTP id z7mr10267335pjh.7.1643837067946; Wed, 02 Feb 2022 13:24:27 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:f1c4:10b6:b4ef:16e5]) by smtp.gmail.com with ESMTPSA id on9sm7627983pjb.16.2022.02.02.13.24.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 13:24:27 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: pmaliset@codeaurora.org, mka@chromium.org, quic_rjendra@quicinc.com, Shaik Sajida Bhanu , kgodara@codeaurora.org, konrad.dybcio@somainline.org, Sankeerth Billakanti , sibis@codeaurora.org, swboyd@chromium.org, Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 12/14] arm64: dts: qcom: sc7280: Add herobrine-r1 Date: Wed, 2 Feb 2022 13:23:46 -0800 Message-Id: <20220202132301.v3.12.I5604b7af908e8bbe709ac037a6a8a6ba8a2bfa94@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220202212348.1391534-1-dianders@chromium.org> References: <20220202212348.1391534-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add the new herobrine-r1. Note that this is pretty much a re-design compared to herobrine-r0 so we don't attempt any dtsi to share stuff between them. This patch attempts to define things at 3 levels: 1. The Qcard level. Herobrine includes a Qcard PCB and the Qcard PCB is supposed to be the same (modulo stuffing options) across multiple boards, so trying to define what's there hopefully makes sense. NOTE that newer "CRD" boards from Qualcomm also use Qcard. When support for CRD3 is added hopefully it can use the Qcard include (and perhaps we should even evaluate it using herobrine.dtsi?) 2. The herobrine "baseboard" level. Right now most stuff is here with the exception of things that we _know_ will be different per board. We know that not all boards will have the same set of eMMC, nvme, and SD. We also know that the exact pin names are likely to be different. 3. The actual "board" level, AKA herobrine-rev1. NOTES: - This boots to command prompt. We're still waiting on the PWM driver. - This assumes LTE for now. Once it's clear how WiFi-only SKUs will work we expect some small changes. Signed-off-by: Douglas Anderson --- Removed Reviewed-by tags in v3 since it felt like there were enough changes that people should re-confirm that they're happy. Changes in v3: - Rebased atop dts cleanup patches. - Add regulator suffix as per dts cleanup patches. - Set PCIe bias / pull as per dts cleanup patches. - Add dp_hot_plug_det pull as per dts cleanup patches. - Setup SD card same as dts cleanup patches. Changes in v2: - Herobrine compatible on one line, not two - Wording change in comments for components enabled per-board - Always sort "bias" above "drive-strength" in pinctrl. - Properly sort "hub_en" pinctrl. - Two comments moved from multiline to single line. - Space after "/delete-property/" arch/arm64/boot/dts/qcom/Makefile | 1 + .../qcom/sc7280-herobrine-herobrine-r0.dts | 3 +- .../qcom/sc7280-herobrine-herobrine-r1.dts | 313 +++++++ .../arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 785 ++++++++++++++++++ arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 547 ++++++++++++ 5 files changed, 1647 insertions(+), 2 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.= dts create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi create mode 100644 arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/M= akefile index 8aa3b3f1a292..45f8cac32e4a 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -84,6 +84,7 @@ dtb-$(CONFIG_ARCH_QCOM) +=3D sc7180-trogdor-pompom-r3-lte= .dtb dtb-$(CONFIG_ARCH_QCOM) +=3D sc7180-trogdor-r1.dtb dtb-$(CONFIG_ARCH_QCOM) +=3D sc7180-trogdor-r1-lte.dtb dtb-$(CONFIG_ARCH_QCOM) +=3D sc7280-herobrine-herobrine-r0.dtb +dtb-$(CONFIG_ARCH_QCOM) +=3D sc7280-herobrine-herobrine-r1.dtb dtb-$(CONFIG_ARCH_QCOM) +=3D sc7280-idp.dtb dtb-$(CONFIG_ARCH_QCOM) +=3D sc7280-idp2.dtb dtb-$(CONFIG_ARCH_QCOM) +=3D sc7280-crd.dtb diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts b/a= rch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts index bdc3f341ecf6..f7d4adeae90c 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts @@ -25,8 +25,7 @@ =20 / { model =3D "Google Herobrine (rev0)"; - compatible =3D "google,herobrine", - "qcom,sc7280"; + compatible =3D "google,herobrine-rev0", "qcom,sc7280"; }; =20 / { diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts b/a= rch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts new file mode 100644 index 000000000000..f95273052da0 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts @@ -0,0 +1,313 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Herobrine board device tree source + * + * Copyright 2022 Google LLC. + */ + +/dts-v1/; + +#include "sc7280-herobrine.dtsi" + +/ { + model =3D "Google Herobrine (rev1+)"; + compatible =3D "google,herobrine", "qcom,sc7280"; +}; + +/* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */ + +&ap_spi_fp { + status =3D "okay"; +}; + +/* + * Although the trackpad is really part of the herobrine baseboard, we'll + * put the actual definition in the board device tree since different boar= ds + * might hook up different trackpads (or no i2c trackpad at all in the case + * of tablets / detachables). + */ +ap_tp_i2c: &i2c0 { + status =3D "okay"; + clock-frequency =3D <400000>; + + trackpad: trackpad@15 { + compatible =3D "elan,ekth3000"; + reg =3D <0x15>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&tp_int_odl>; + + interrupt-parent =3D <&tlmm>; + interrupts =3D <7 IRQ_TYPE_EDGE_FALLING>; + + vcc-supply =3D <&pp3300_z1>; + + wakeup-source; + }; +}; + +/* + * The touchscreen connector might come off the Qcard, at least in the cas= e of + * eDP. Like the trackpad, we'll put it in the board device tree file since + * different boards have different touchscreens. + */ +ts_i2c: &i2c13 { + status =3D "okay"; + clock-frequency =3D <400000>; + + ap_ts: touchscreen@5c { + compatible =3D "hid-over-i2c"; + reg =3D <0x5c>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&ts_int_conn>, <&ts_rst_conn>; + + interrupt-parent =3D <&tlmm>; + interrupts =3D <55 IRQ_TYPE_LEVEL_LOW>; + + post-power-on-delay-ms =3D <500>; + hid-descr-addr =3D <0x0000>; + + vdd-supply =3D <&ts_avdd>; + }; +}; + +/* For nvme */ +&pcie1 { + status =3D "okay"; +}; + +/* For nvme */ +&pcie1_phy { + status =3D "okay"; +}; + +/* For eMMC */ +&sdhc_1 { + status =3D "okay"; +}; + +/* For SD Card */ +&sdhc_2 { + status =3D "okay"; +}; + +/* PINCTRL - BOARD-SPECIFIC */ + +/* + * Methodology for gpio-line-names: + * - If a pin goes to herobrine board and is named it gets that name. + * - If a pin goes to herobrine board and is not named, it gets no name. + * - If a pin is totally internal to Qcard then it gets Qcard name. + * - If a pin is not hooked up on Qcard, it gets no name. + */ + +&pm8350c_gpios { + gpio-line-names =3D "FLASH_STROBE_1", /* 1 */ + "AP_SUSPEND", + "PM8008_1_RST_N", + "", + "", + "", + "PMIC_EDP_BL_EN", + "PMIC_EDP_BL_PWM", + ""; +}; + +&tlmm { + gpio-line-names =3D "AP_TP_I2C_SDA", /* 0 */ + "AP_TP_I2C_SCL", + "SSD_RST_L", + "PE_WAKE_ODL", + "AP_SAR_SDA", + "AP_SAR_SCL", + "PRB_SC_GPIO_6", + "TP_INT_ODL", + "HP_I2C_SDA", + "HP_I2C_SCL", + + "GNSS_L1_EN", /* 10 */ + "GNSS_L5_EN", + "SPI_AP_MOSI", + "SPI_AP_MISO", + "SPI_AP_CLK", + "SPI_AP_CS0_L", + /* + * AP_FLASH_WP is crossystem ABI. Schematics + * call it BIOS_FLASH_WP_OD. + */ + "AP_FLASH_WP", + "", + "AP_EC_INT_L", + "", + + "UF_CAM_RST_L", /* 20 */ + "WF_CAM_RST_L", + "UART_AP_TX_DBG_RX", + "UART_DBG_TX_AP_RX", + "", + "PM8008_IRQ_1", + "HOST2WLAN_SOL", + "WLAN2HOST_SOL", + "MOS_BT_UART_CTS", + "MOS_BT_UART_RFR", + + "MOS_BT_UART_TX", /* 30 */ + "MOS_BT_UART_RX", + "PRB_SC_GPIO_32", + "HUB_RST_L", + "", + "", + "AP_SPI_FP_MISO", + "AP_SPI_FP_MOSI", + "AP_SPI_FP_CLK", + "AP_SPI_FP_CS_L", + + "AP_EC_SPI_MISO", /* 40 */ + "AP_EC_SPI_MOSI", + "AP_EC_SPI_CLK", + "AP_EC_SPI_CS_L", + "LCM_RST_L", + "EARLY_EUD_N", + "", + "DP_HOT_PLUG_DET", + "IO_BRD_MLB_ID0", + "IO_BRD_MLB_ID1", + + "IO_BRD_MLB_ID2", /* 50 */ + "SSD_EN", + "TS_I2C_SDA_CONN", + "TS_I2C_CLK_CONN", + "TS_RST_CONN", + "TS_INT_CONN", + "AP_I2C_TPM_SDA", + "AP_I2C_TPM_SCL", + "PRB_SC_GPIO_58", + "PRB_SC_GPIO_59", + + "EDP_HOT_PLUG_DET_N", /* 60 */ + "FP_TO_AP_IRQ_L", + "", + "AMP_EN", + "CAM0_MCLK_GPIO_64", + "CAM1_MCLK_GPIO_65", + "WF_CAM_MCLK", + "PRB_SC_GPIO_67", + "FPMCU_BOOT0", + "UF_CAM_SDA", + + "UF_CAM_SCL", /* 70 */ + "", + "", + "WF_CAM_SDA", + "WF_CAM_SCL", + "", + "", + "EN_FP_RAILS", + "FP_RST_L", + "PCIE1_CLKREQ_ODL", + + "EN_PP3300_DX_EDP", /* 80 */ + "SC_GPIO_81", + "FORCED_USB_BOOT", + "WCD_RESET_N", + "MOS_WLAN_EN", + "MOS_BT_EN", + "MOS_SW_CTRL", + "MOS_PCIE0_RST", + "MOS_PCIE0_CLKREQ_N", + "MOS_PCIE0_WAKE_N", + + "MOS_LAA_AS_EN", /* 90 */ + "SD_CD_ODL", + "", + "", + "MOS_BT_WLAN_SLIMBUS_CLK", + "MOS_BT_WLAN_SLIMBUS_DAT0", + "HP_MCLK", + "HP_BCLK", + "HP_DOUT", + "HP_DIN", + + "HP_LRCLK", /* 100 */ + "HP_IRQ", + "", + "", + "GSC_AP_INT_ODL", + "EN_PP3300_CODEC", + "AMP_BCLK", + "AMP_DIN", + "AMP_LRCLK", + "UIM1_DATA_GPIO_109", + + "UIM1_CLK_GPIO_110", /* 110 */ + "UIM1_RESET_GPIO_111", + "PRB_SC_GPIO_112", + "UIM0_DATA", + "UIM0_CLK", + "UIM0_RST", + "UIM0_PRESENT_ODL", + "SDM_RFFE0_CLK", + "SDM_RFFE0_DATA", + "WF_CAM_EN", + + "FASTBOOT_SEL_0", /* 120 */ + "SC_GPIO_121", + "FASTBOOT_SEL_1", + "SC_GPIO_123", + "FASTBOOT_SEL_2", + "SM_RFFE4_CLK_GRFC_8", + "SM_RFFE4_DATA_GRFC_9", + "WLAN_COEX_UART1_RX", + "WLAN_COEX_UART1_TX", + "PRB_SC_GPIO_129", + + "LCM_ID0", /* 130 */ + "LCM_ID1", + "", + "SDR_QLINK_REQ", + "SDR_QLINK_EN", + "QLINK0_WMSS_RESET_N", + "SMR526_QLINK1_REQ", + "SMR526_QLINK1_EN", + "SMR526_QLINK1_WMSS_RESET_N", + "PRB_SC_GPIO_139", + + "SAR1_IRQ_ODL", /* 140 */ + "SAR0_IRQ_ODL", + "PRB_SC_GPIO_142", + "", + "WCD_SWR_TX_CLK", + "WCD_SWR_TX_DATA0", + "WCD_SWR_TX_DATA1", + "WCD_SWR_RX_CLK", + "WCD_SWR_RX_DATA0", + "WCD_SWR_RX_DATA1", + + "DMIC01_CLK", /* 150 */ + "DMIC01_DATA", + "DMIC23_CLK", + "DMIC23_DATA", + "", + "", + "EC_IN_RW_ODL", + "HUB_EN", + "WCD_SWR_TX_DATA2", + "", + + "", /* 160 */ + "", + "", + "", + "", + "", + "", + "", + "", + "", + + "", /* 170 */ + "MOS_BLE_UART_TX", + "MOS_BLE_UART_RX", + "", + "", + ""; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi b/arch/arm64/bo= ot/dts/qcom/sc7280-herobrine.dtsi new file mode 100644 index 000000000000..1236b0507f04 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi @@ -0,0 +1,785 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Herobrine baseboard device tree source + * + * The set of things in this file is a bit loosely defined. It's roughly + * defined as the set of things that the child boards happen to have in + * common. Since all of the child boards started from the same original + * design this is hopefully a large set of things but as more derivatives + * appear things may "bubble down" out of this file. For things that are + * part of the reference design but might not exist on child nodes we will + * follow the lead of the SoC dtsi files and leave their status as "disabl= ed". + * + * Copyright 2022 Google LLC. + */ + +#include +#include + +#include "sc7280-qcard.dtsi" +#include "sc7280-chrome-common.dtsi" + +/ { + chosen { + stdout-path =3D "serial0:115200n8"; + }; + + /* + * FIXED REGULATORS + * + * Sort order: + * 1. parents above children. + * 2. higher voltage above lower voltage. + * 3. alphabetically by node name. + */ + + /* This is the top level supply and variable voltage */ + ppvar_sys: ppvar-sys-regulator { + compatible =3D "regulator-fixed"; + regulator-name =3D "ppvar_sys"; + regulator-always-on; + regulator-boot-on; + }; + + /* This divides ppvar_sys by 2, so voltage is variable */ + src_vph_pwr: src-vph-pwr-regulator { + compatible =3D "regulator-fixed"; + regulator-name =3D "src_vph_pwr"; + + /* EC turns on with switchcap_on; always on for AP */ + regulator-always-on; + regulator-boot-on; + + vin-supply =3D <&ppvar_sys>; + }; + + pp5000_s5: pp5000-s5-regulator { + compatible =3D "regulator-fixed"; + regulator-name =3D "pp5000_s5"; + + /* EC turns on with en_pp5000_s5; always on for AP */ + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt =3D <5000000>; + regulator-max-microvolt =3D <5000000>; + + vin-supply =3D <&ppvar_sys>; + }; + + pp3300_z1: pp3300-z1-regulator { + compatible =3D "regulator-fixed"; + regulator-name =3D "pp3300_z1"; + + /* EC turns on with en_pp3300_z1; always on for AP */ + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + + vin-supply =3D <&ppvar_sys>; + }; + + pp3300_codec: pp3300-codec-regulator { + compatible =3D "regulator-fixed"; + regulator-name =3D "pp3300_codec"; + + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + + gpio =3D <&tlmm 105 GPIO_ACTIVE_HIGH>; + enable-active-high; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&en_pp3300_codec>; + + vin-supply =3D <&pp3300_z1>; + }; + + pp3300_left_in_mlb: pp3300-left-in-mlb-regulator { + compatible =3D "regulator-fixed"; + regulator-name =3D "pp3300_left_in_mlb"; + + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + + gpio =3D <&tlmm 80 GPIO_ACTIVE_HIGH>; + enable-active-high; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&en_pp3300_dx_edp>; + + vin-supply =3D <&pp3300_z1>; + }; + + pp3300_mcu_fp: + pp3300_fp_ls: + pp3300_fp_mcu: pp3300-fp-regulator { + compatible =3D "regulator-fixed"; + regulator-name =3D "pp3300_fp"; + + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + + regulator-boot-on; + regulator-always-on; + + /* + * WARNING: it is intentional that GPIO 77 isn't listed here. + * The userspace script for updating the fingerprint firmware + * needs to control the FP regulators during a FW update, + * hence the signal can't be owned by the kernel regulator. + */ + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&en_fp_rails>; + + vin-supply =3D <&pp3300_z1>; + }; + + pp3300_hub: pp3300-hub-regulator { + compatible =3D "regulator-fixed"; + regulator-name =3D "pp3300_hub"; + + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + + regulator-boot-on; + regulator-always-on; + + gpio =3D <&tlmm 157 GPIO_ACTIVE_HIGH>; + enable-active-high; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&hub_en>; + + vin-supply =3D <&pp3300_z1>; + }; + + pp3300_tp: pp3300-tp-regulator { + compatible =3D "regulator-fixed"; + regulator-name =3D "pp3300_tp"; + + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + + /* AP turns on with PP1800_L18B_S0; always on for AP */ + regulator-always-on; + regulator-boot-on; + + vin-supply =3D <&pp3300_z1>; + }; + + pp3300_ssd: pp3300-ssd-regulator { + compatible =3D "regulator-fixed"; + regulator-name =3D "pp3300_ssd"; + + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + + gpio =3D <&tlmm 51 GPIO_ACTIVE_HIGH>; + enable-active-high; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&ssd_en>; + + vin-supply =3D <&pp3300_z1>; + }; + + pp2850_vcm_wf_cam: pp2850-vcm-wf-cam-regulator { + compatible =3D "regulator-fixed"; + regulator-name =3D "pp2850_vcm_wf_cam"; + + regulator-min-microvolt =3D <2850000>; + regulator-max-microvolt =3D <2850000>; + + gpio =3D <&tlmm 119 GPIO_ACTIVE_HIGH>; + enable-active-high; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&wf_cam_en>; + + vin-supply =3D <&pp3300_z1>; + }; + + pp2850_wf_cam: pp2850-wf-cam-regulator { + compatible =3D "regulator-fixed"; + regulator-name =3D "pp2850_wf_cam"; + + regulator-min-microvolt =3D <2850000>; + regulator-max-microvolt =3D <2850000>; + + gpio =3D <&tlmm 119 GPIO_ACTIVE_HIGH>; + enable-active-high; + /* + * The pinconf can only be referenced once so we put it on the + * first regulator and comment it out here. + * + * pinctrl-names =3D "default"; + * pinctrl-0 =3D <&wf_cam_en>; + */ + + vin-supply =3D <&pp3300_z1>; + }; + + pp1800_fp: pp1800-fp-regulator { + compatible =3D "regulator-fixed"; + regulator-name =3D "pp1800_fp"; + + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + + regulator-boot-on; + regulator-always-on; + + /* + * WARNING: it is intentional that GPIO 77 isn't listed here. + * The userspace script for updating the fingerprint firmware + * needs to control the FP regulators during a FW update, + * hence the signal can't be owned by the kernel regulator. + */ + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&en_fp_rails>; + + vin-supply =3D <&pp1800_l18b_s0>; + status =3D "disabled"; + }; + + pp1800_wf_cam: pp1800-wf-cam-regulator { + compatible =3D "regulator-fixed"; + regulator-name =3D "pp1800_wf_cam"; + + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + + gpio =3D <&tlmm 119 GPIO_ACTIVE_HIGH>; + enable-active-high; + /* + * The pinconf can only be referenced once so we put it on the + * first regulator and comment it out here. + * + * pinctrl-names =3D "default"; + * pinctrl-0 =3D <&wf_cam_en>; + */ + + vin-supply =3D <&vreg_l19b_s0>; + }; + + pp1200_wf_cam: pp1200-wf-cam-regulator { + compatible =3D "regulator-fixed"; + regulator-name =3D "pp1200_wf_cam"; + + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1200000>; + + gpio =3D <&tlmm 119 GPIO_ACTIVE_HIGH>; + enable-active-high; + /* + * The pinconf can only be referenced once so we put it on the + * first regulator and comment it out here. + * + * pinctrl-names =3D "default"; + * pinctrl-0 =3D <&wf_cam_en>; + */ + + vin-supply =3D <&pp3300_z1>; + }; + + /* BOARD-SPECIFIC TOP LEVEL NODES */ + + pwmleds { + compatible =3D "pwm-leds"; + status =3D "disabled"; + keyboard_backlight: keyboard-backlight { + status =3D "disabled"; + label =3D "cros_ec::kbd_backlight"; + pwms =3D <&cros_ec_pwm 0>; + max-brightness =3D <1023>; + }; + }; +}; + +/* + * BOARD-LOCAL NAMES FOR REGULATORS THAT CONNECT TO QCARD + * + * Names are only listed here if regulators go somewhere other than a + * testpoint. + */ + +/* From Qcard to our board; ordered by PMIC-ID / rail number */ + +pp1256_s8b: &vreg_s8b_1p256 {}; + +pp1800_l18b_s0: &vreg_l18b_1p8 {}; +pp1800_l18b: &vreg_l18b_1p8 {}; + +vreg_l19b_s0: &vreg_l19b_1p8 {}; + +pp1800_alc5682: &vreg_l2c_1p8 {}; +pp1800_l2c: &vreg_l2c_1p8 {}; + +vreg_l4c: &vreg_l4c_1p8_3p0 {}; + +ppvar_l6c: &vreg_l6c_2p96 {}; + +pp3000_l7c: &vreg_l7c_3p0 {}; + +pp1800_prox: &vreg_l8c_1p8 {}; +pp1800_l8c: &vreg_l8c_1p8 {}; + +pp2950_l9c: &vreg_l9c_2p96 {}; + +pp1800_lcm: &vreg_l12c_1p8 {}; +pp1800_mipi: &vreg_l12c_1p8 {}; +pp1800_l12c: &vreg_l12c_1p8 {}; + +pp3300_lcm: &vreg_l13c_3p0 {}; +pp3300_mipi: &vreg_l13c_3p0 {}; +pp3300_l13c: &vreg_l13c_3p0 {}; + +/* From our board to Qcard; ordered same as node definition above */ + +vreg_edp_bl: &ppvar_sys {}; + +ts_avdd: &pp3300_left_in_mlb {}; +vreg_edp_3p3: &pp3300_left_in_mlb {}; + +/* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */ + +ap_i2c_tpm: &i2c14 { + status =3D "okay"; + clock-frequency =3D <400000>; + + tpm@50 { + compatible =3D "google,cr50"; + reg =3D <0x50>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&gsc_ap_int_odl>; + + interrupt-parent =3D <&tlmm>; + interrupts =3D <104 IRQ_TYPE_EDGE_RISING>; + }; +}; + +/* NVMe drive, enabled on a per-board basis */ +&pcie1 { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pcie1_clkreq_n>, <&ssd_rst_l>, <&pe_wake_odl>; + + perst-gpio =3D <&tlmm 2 GPIO_ACTIVE_LOW>; + vddpe-3v3-supply =3D <&pp3300_ssd>; +}; + +&pmk8350_rtc { + status =3D "disabled"; +}; + +&qupv3_id_0 { + status =3D "okay"; +}; + +&qupv3_id_1 { + status =3D "okay"; +}; + +/* SD Card, enabled on a per-board basis */ +&sdhc_2 { + pinctrl-0 =3D <&sdc2_clk>, <&sdc2_cmd>, <&sdc2_data>, <&sd_cd_odl>; + pinctrl-1 =3D <&sdc2_clk_sleep>, <&sdc2_cmd_sleep>, <&sdc2_data_sleep>, <= &sd_cd_odl>; + + vmmc-supply =3D <&pp2950_l9c>; + vqmmc-supply =3D <&ppvar_l6c>; + + cd-gpios =3D <&tlmm 91 GPIO_ACTIVE_LOW>; +}; + +/* Fingerprint, enabled on a per-board basis */ +ap_spi_fp: &spi9 { + pinctrl-0 =3D <&qup_spi9_data_clk>, <&qup_spi9_cs_gpio_init_high>, <&qup_= spi9_cs_gpio>; + + cs-gpios =3D <&tlmm 39 GPIO_ACTIVE_LOW>; + + cros_ec_fp: ec@0 { + compatible =3D "google,cros-ec-spi"; + reg =3D <0>; + interrupt-parent =3D <&tlmm>; + interrupts =3D <61 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&fp_to_ap_irq_l>, <&fp_rst_l>, <&fpmcu_boot0>; + spi-max-frequency =3D <3000000>; + }; +}; + +ap_ec_spi: &spi10 { + status =3D "okay"; + pinctrl-0 =3D <&qup_spi10_data_clk>, <&qup_spi10_cs_gpio_init_high>, <&qu= p_spi10_cs_gpio>; + + cs-gpios =3D <&tlmm 43 GPIO_ACTIVE_LOW>; + + cros_ec: ec@0 { + compatible =3D "google,cros-ec-spi"; + reg =3D <0>; + interrupt-parent =3D <&tlmm>; + interrupts =3D <18 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&ap_ec_int_l>; + spi-max-frequency =3D <3000000>; + + cros_ec_pwm: ec-pwm { + compatible =3D "google,cros-ec-pwm"; + #pwm-cells =3D <1>; + }; + + i2c_tunnel: i2c-tunnel { + compatible =3D "google,cros-ec-i2c-tunnel"; + google,remote-bus =3D <0>; + #address-cells =3D <1>; + #size-cells =3D <0>; + }; + + typec { + compatible =3D "google,cros-ec-typec"; + #address-cells =3D <1>; + #size-cells =3D <0>; + + usb_c0: connector@0 { + compatible =3D "usb-c-connector"; + reg =3D <0>; + label =3D "left"; + power-role =3D "dual"; + data-role =3D "host"; + try-power-role =3D "source"; + }; + + usb_c1: connector@1 { + compatible =3D "usb-c-connector"; + reg =3D <1>; + label =3D "right"; + power-role =3D "dual"; + data-role =3D "host"; + try-power-role =3D "source"; + }; + }; + }; +}; + +#include +#include + +&keyboard_controller { + function-row-physmap =3D < + 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 =3D < + 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 + >; +}; + +&usb_1 { + status =3D "okay"; +}; + +&usb_1_dwc3 { + dr_mode =3D "host"; +}; + +&usb_1_hsphy { + status =3D "okay"; +}; + +&usb_1_qmpphy { + status =3D "okay"; +}; + +&usb_2 { + status =3D "okay"; +}; + +&usb_2_dwc3 { + dr_mode =3D "host"; +}; + +&usb_2_hsphy { + status =3D "okay"; +}; + +/* PINCTRL - ADDITIONS TO NODES IN PARENT DEVICE TREE FILES */ + +&dp_hot_plug_det { + bias-disable; +}; + +&pcie1_clkreq_n { + bias-disable; + drive-strength =3D <2>; +}; + +&qspi_cs0 { + bias-disable; + drive-strength =3D <8>; +}; + +&qspi_clk { + bias-disable; + drive-strength =3D <8>; +}; + +&qspi_data01 { + /* High-Z when no transfers; nice to park the lines */ + bias-pull-up; + drive-strength =3D <8>; +}; + +/* For ap_tp_i2c */ +&qup_i2c0_data_clk { + /* Has external pull */ + bias-disable; + drive-strength =3D <2>; +}; + +/* For ap_i2c_tpm */ +&qup_i2c14_data_clk { + /* Has external pull */ + bias-disable; + drive-strength =3D <2>; +}; + +/* For ap_spi_fp */ +&qup_spi9_data_clk { + bias-disable; + drive-strength =3D <2>; +}; + +/* For ap_spi_fp */ +&qup_spi9_cs_gpio { + bias-disable; + drive-strength =3D <2>; +}; + +/* For ap_ec_spi */ +&qup_spi10_data_clk { + bias-disable; + drive-strength =3D <2>; +}; + +/* For ap_ec_spi */ +&qup_spi10_cs_gpio { + bias-disable; + drive-strength =3D <2>; +}; + +/* For uart_dbg */ +&qup_uart5_rx { + bias-pull-up; +}; + +/* For uart_dbg */ +&qup_uart5_tx { + bias-disable; + drive-strength =3D <2>; +}; + +&sdc2_clk { + bias-disable; + drive-strength =3D <16>; +}; + +&sdc2_cmd { + bias-pull-up; + drive-strength =3D <10>; +}; + +&sdc2_data { + bias-pull-up; + drive-strength =3D <10>; +}; + +/* PINCTRL - board-specific pinctrl */ + +&pm7325_gpios { + /* + * On a quick glance it might look like KYPD_VOL_UP_N is used, but + * that only passes through to a debug connector and not to the actual + * volume up key. + */ + status =3D "disabled"; /* No GPIOs are connected */ +}; + +&pmk8350_gpios { + status =3D "disabled"; /* No GPIOs are connected */ +}; + +&tlmm { + /* pinctrl settings for pins that have no real owners. */ + pinctrl-names =3D "default"; + pinctrl-0 =3D <&bios_flash_wp_od>; + + amp_en: amp-en { + pins =3D "gpio63"; + function =3D "gpio"; + bias-disable; + drive-strength =3D <2>; + }; + + ap_ec_int_l: ap-ec-int-l { + pins =3D "gpio18"; + function =3D "gpio"; + bias-pull-up; + }; + + bios_flash_wp_od: bios-flash-wp-od { + pins =3D "gpio16"; + function =3D "gpio"; + /* Has external pull */ + bias-disable; + }; + + en_fp_rails: en-fp-rails { + pins =3D "gpio77"; + function =3D "gpio"; + bias-disable; + drive-strength =3D <2>; + output-high; + }; + + en_pp3300_codec: en-pp3300-codec { + pins =3D "gpio105"; + function =3D "gpio"; + bias-disable; + drive-strength =3D <2>; + }; + + en_pp3300_dx_edp: en-pp3300-dx-edp { + pins =3D "gpio80"; + function =3D "gpio"; + bias-disable; + drive-strength =3D <2>; + }; + + fp_rst_l: fp-rst-l { + pins =3D "gpio78"; + function =3D "gpio"; + bias-disable; + drive-strength =3D <2>; + output-high; + }; + + fp_to_ap_irq_l: fp-to-ap-irq-l { + pins =3D "gpio61"; + function =3D "gpio"; + /* Has external pullup */ + bias-disable; + }; + + fpmcu_boot0: fpmcu-boot0 { + pins =3D "gpio68"; + function =3D "gpio"; + bias-disable; + output-low; + }; + + gsc_ap_int_odl: gsc-ap-int-odl { + pins =3D "gpio104"; + function =3D "gpio"; + bias-pull-up; + }; + + hp_irq: hp-irq { + pins =3D "gpio101"; + function =3D "gpio"; + bias-pull-up; + }; + + hub_en: hub-en { + pins =3D "gpio157"; + function =3D "gpio"; + bias-disable; + drive-strength =3D <2>; + }; + + pe_wake_odl: pe-wake-odl { + pins =3D "gpio3"; + function =3D "gpio"; + /* Has external pull */ + bias-disable; + drive-strength =3D <2>; + }; + + /* For ap_spi_fp */ + qup_spi9_cs_gpio_init_high: qup-spi9-cs-gpio-init-high { + pins =3D "gpio39"; + function =3D "gpio"; + output-high; + }; + + /* For ap_ec_spi */ + qup_spi10_cs_gpio_init_high: qup-spi10-cs-gpio-init-high { + pins =3D "gpio43"; + function =3D "gpio"; + output-high; + }; + + sar0_irq_odl: sar0-irq-odl { + pins =3D "gpio141"; + function =3D "gpio"; + bias-pull-up; + }; + + sar1_irq_odl: sar0-irq-odl { + pins =3D "gpio140"; + function =3D "gpio"; + bias-pull-up; + }; + + sd_cd_odl: sd-cd-odl { + pins =3D "gpio91"; + function =3D "gpio"; + bias-pull-up; + }; + + ssd_en: ssd-en { + pins =3D "gpio51"; + function =3D "gpio"; + bias-disable; + drive-strength =3D <2>; + }; + + ssd_rst_l: ssd-rst-l { + pins =3D "gpio2"; + function =3D "gpio"; + bias-disable; + drive-strength =3D <2>; + output-low; + }; + + tp_int_odl: tp-int-odl { + pins =3D "gpio7"; + function =3D "gpio"; + /* Has external pullup */ + bias-disable; + }; + + wf_cam_en: wf-cam-en { + pins =3D "gpio119"; + function =3D "gpio"; + /* Has external pulldown */ + bias-disable; + drive-strength =3D <2>; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi b/arch/arm64/boot/d= ts/qcom/sc7280-qcard.dtsi new file mode 100644 index 000000000000..b833ba1e8f4a --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi @@ -0,0 +1,547 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * sc7280 Qcard device tree source + * + * Qcard PCB has the processor, RAM, eMMC (if stuffed), and eDP connector = (if + * stuffed) on it. This device tree tries to encapsulate all the things th= at + * all boards using Qcard will have in common. Given that there are stuffi= ng + * options, some things may be left with status "disabled" and enabled in + * the actual board device tree files. + * + * Copyright 2022 Google LLC. + */ + +#include +#include +#include +#include + +#include "sc7280.dtsi" + +/* PMICs depend on spmi_bus label and so must come after SoC */ +#include "pm7325.dtsi" +#include "pm8350c.dtsi" +#include "pmk8350.dtsi" + +/ { + aliases { + bluetooth0 =3D &bluetooth; + serial0 =3D &uart5; + serial1 =3D &uart7; + }; +}; + +&apps_rsc { + /* + * Regulators are given labels corresponding to the various names + * they are referred to on schematics. They are also given labels + * corresponding to named voltage inputs on the SoC or components + * bundled with the SoC (like radio companion chips). We totally + * ignore it when one regulator is the input to another regulator. + * That's handled automatically by the initial config given to + * RPMH by the firmware. + * + * Regulators that the HLOS (High Level OS) doesn't touch at all + * are left out of here since they are managed elsewhere. + */ + + pm7325-regulators { + compatible =3D "qcom,pm7325-rpmh-regulators"; + qcom,pmic-id =3D "b"; + + vdd19_pmu_pcie_i: + vdd19_pmu_rfa_i: + vreg_s1b_1p856: smps1 { + regulator-min-microvolt =3D <1856000>; + regulator-max-microvolt =3D <2040000>; + }; + + vdd_pmu_aon_i: + vdd09_pmu_rfa_i: + vdd095_mx_pmu: + vdd095_pmu: + vreg_s7b_0p952: smps7 { + regulator-min-microvolt =3D <535000>; + regulator-max-microvolt =3D <1120000>; + }; + + vdd13_pmu_rfa_i: + vdd13_pmu_pcie_i: + vreg_s8b_1p256: smps8 { + regulator-min-microvolt =3D <1256000>; + regulator-max-microvolt =3D <1500000>; + }; + + vdd_a_usbssdp_0_core: + vreg_l1b_0p912: ldo1 { + regulator-min-microvolt =3D <825000>; + regulator-max-microvolt =3D <925000>; + regulator-initial-mode =3D ; + }; + + vdd_a_usbhs_3p1: + vreg_l2b_3p072: ldo2 { + regulator-min-microvolt =3D <2700000>; + regulator-max-microvolt =3D <3544000>; + regulator-initial-mode =3D ; + }; + + vdd_a_csi_0_1_1p2: + vdd_a_csi_2_3_1p2: + vdd_a_csi_4_1p2: + vdd_a_dsi_0_1p2: + vdd_a_edp_0_1p2: + vdd_a_qlink_0_1p2: + vdd_a_qlink_1_1p2: + vdd_a_pcie_0_1p2: + vdd_a_pcie_1_1p2: + vdd_a_ufs_0_1p2: + vdd_a_usbssdp_0_1p2: + vreg_l6b_1p2: ldo6 { + regulator-min-microvolt =3D <1140000>; + regulator-max-microvolt =3D <1260000>; + regulator-initial-mode =3D ; + }; + + /* + * Despite the fact that this is named to be 2.5V on the + * schematic, it powers eMMC which doesn't accept 2.5V + */ + vreg_l7b_2p5: ldo7 { + regulator-min-microvolt =3D <2960000>; + regulator-max-microvolt =3D <2960000>; + regulator-initial-mode =3D ; + }; + + vdd_px_wcd9385: + vdd_txrx: + vddpx_0: + vddpx_3: + vddpx_7: + vreg_l18b_1p8: ldo18 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2000000>; + regulator-initial-mode =3D ; + }; + + vdd_1p8: + vdd_px_sdr735: + vdd_pxm: + vdd18_io: + vddio_px_1: + vddio_px_2: + vddio_px_3: + vddpx_ts: + vddpx_wl4otp: + vreg_l19b_1p8: ldo19 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + regulator-initial-mode =3D ; + }; + }; + + pm8350c-regulators { + compatible =3D "qcom,pm8350c-rpmh-regulators"; + qcom,pmic-id =3D "c"; + + vdd22_wlbtpa_ch0: + vdd22_wlbtpa_ch1: + vdd22_wlbtppa_ch0: + vdd22_wlbtppa_ch1: + vdd22_wlpa5g_ch0: + vdd22_wlpa5g_ch1: + vdd22_wlppa5g_ch0: + vdd22_wlppa5g_ch1: + vreg_s1c_2p2: smps1 { + regulator-min-microvolt =3D <2190000>; + regulator-max-microvolt =3D <2210000>; + }; + + lp4_vdd2_1p052: + vreg_s9c_0p676: smps9 { + regulator-min-microvolt =3D <1010000>; + regulator-max-microvolt =3D <1170000>; + }; + + vdda_apc_cs_1p8: + vdda_gfx_cs_1p8: + vdda_turing_q6_cs_1p8: + vdd_a_cxo_1p8: + vdd_a_qrefs_1p8: + vdd_a_usbhs_1p8: + vdd_qfprom: + vreg_l1c_1p8: ldo1 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1980000>; + regulator-initial-mode =3D ; + }; + + vreg_l2c_1p8: ldo2 { + regulator-min-microvolt =3D <1620000>; + regulator-max-microvolt =3D <1980000>; + regulator-initial-mode =3D ; + }; + + vreg_l3c_3p0: ldo3 { + regulator-min-microvolt =3D <2800000>; + regulator-max-microvolt =3D <3540000>; + regulator-initial-mode =3D ; + }; + + vddpx_5: + vreg_l4c_1p8_3p0: ldo4 { + regulator-min-microvolt =3D <1620000>; + regulator-max-microvolt =3D <3300000>; + regulator-initial-mode =3D ; + }; + + vddpx_6: + vreg_l5c_1p8_3p0: ldo5 { + regulator-min-microvolt =3D <1620000>; + regulator-max-microvolt =3D <3300000>; + regulator-initial-mode =3D ; + }; + + vddpx_2: + vreg_l6c_2p96: ldo6 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; + regulator-initial-mode =3D ; + }; + + vreg_l7c_3p0: ldo7 { + regulator-min-microvolt =3D <3000000>; + regulator-max-microvolt =3D <3544000>; + regulator-initial-mode =3D ; + }; + + vreg_l8c_1p8: ldo8 { + regulator-min-microvolt =3D <1620000>; + regulator-max-microvolt =3D <2000000>; + regulator-initial-mode =3D ; + }; + + vreg_l9c_2p96: ldo9 { + regulator-min-microvolt =3D <2960000>; + regulator-max-microvolt =3D <2960000>; + regulator-initial-mode =3D ; + }; + + vdd_a_csi_0_1_0p9: + vdd_a_csi_2_3_0p9: + vdd_a_csi_4_0p9: + vdd_a_dsi_0_0p9: + vdd_a_dsi_0_pll_0p9: + vdd_a_edp_0_0p9: + vdd_a_gnss_0p9: + vdd_a_pcie_0_core: + vdd_a_pcie_1_core: + vdd_a_qlink_0_0p9: + vdd_a_qlink_0_0p9_ck: + vdd_a_qlink_1_0p9: + vdd_a_qlink_1_0p9_ck: + vdd_a_qrefs_0p875_0: + vdd_a_qrefs_0p875_1: + vdd_a_qrefs_0p875_2: + vdd_a_qrefs_0p875_3: + vdd_a_qrefs_0p875_4_5: + vdd_a_qrefs_0p875_6: + vdd_a_qrefs_0p875_7: + vdd_a_qrefs_0p875_8: + vdd_a_qrefs_0p875_9: + vdd_a_ufs_0_core: + vdd_a_usbhs_core: + vreg_l10c_0p88: ldo10 { + regulator-min-microvolt =3D <720000>; + regulator-max-microvolt =3D <1050000>; + regulator-initial-mode =3D ; + }; + + vreg_l11c_2p8: ldo11 { + regulator-min-microvolt =3D <2800000>; + regulator-max-microvolt =3D <3544000>; + regulator-initial-mode =3D ; + }; + + vreg_l12c_1p8: ldo12 { + regulator-min-microvolt =3D <1650000>; + regulator-max-microvolt =3D <2000000>; + regulator-initial-mode =3D ; + }; + + vreg_l13c_3p0: ldo13 { + regulator-min-microvolt =3D <2700000>; + regulator-max-microvolt =3D <3544000>; + regulator-initial-mode =3D ; + }; + + vdd_flash: + vdd_iris_rgb: + vdd_mic_bias: + vreg_bob: bob { + regulator-min-microvolt =3D <3008000>; + regulator-max-microvolt =3D <3960000>; + regulator-initial-mode =3D ; + }; + }; +}; + +/* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */ + +&ipa { + status =3D "okay"; + modem-init; +}; + +&pcie1_phy { + vdda-phy-supply =3D <&vreg_l10c_0p88>; + vdda-pll-supply =3D <&vreg_l6b_1p2>; +}; + +&pmk8350_vadc { + pmk8350-die-temp@3 { + reg =3D ; + label =3D "pmk8350_die_temp"; + qcom,pre-scaling =3D <1 1>; + }; + + pmr735a-die-temp@403 { + reg =3D ; + label =3D "pmr735a_die_temp"; + qcom,pre-scaling =3D <1 1>; + }; +}; + +&qfprom { + vcc-supply =3D <&vdd_qfprom>; +}; + +/* For eMMC. NOTE: not all Qcards have eMMC stuffed */ +&sdhc_1 { + vmmc-supply =3D <&vreg_l7b_2p5>; + vqmmc-supply =3D <&vreg_l19b_1p8>; + + non-removable; + no-sd; + no-sdio; +}; + +uart_dbg: &uart5 { + compatible =3D "qcom,geni-debug-uart"; + status =3D "okay"; +}; + +mos_bt_uart: &uart7 { + status =3D "okay"; + + /delete-property/ interrupts; + interrupts-extended =3D <&intc GIC_SPI 608 IRQ_TYPE_LEVEL_HIGH>, + <&tlmm 31 IRQ_TYPE_EDGE_FALLING>; + pinctrl-names =3D "default", "sleep"; + pinctrl-1 =3D <&qup_uart7_sleep_cts>, <&qup_uart7_sleep_rts>, <&qup_uart7= _sleep_tx>, <&qup_uart7_sleep_rx>; + + bluetooth: bluetooth { + compatible =3D "qcom,wcn6750-bt"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&mos_bt_en>; + enable-gpios =3D <&tlmm 85 GPIO_ACTIVE_HIGH>; + swctrl-gpios =3D <&tlmm 86 GPIO_ACTIVE_HIGH>; + vddaon-supply =3D <&vreg_s7b_0p952>; + vddbtcxmx-supply =3D <&vreg_s7b_0p952>; + vddrfacmn-supply =3D <&vreg_s7b_0p952>; + vddrfa0p8-supply =3D <&vreg_s7b_0p952>; + vddrfa1p7-supply =3D <&vdd19_pmu_rfa_i>; + vddrfa1p2-supply =3D <&vdd13_pmu_rfa_i>; + vddrfa2p2-supply =3D <&vreg_s1c_2p2>; + vddasd-supply =3D <&vreg_l11c_2p8>; + vddio-supply =3D <&vreg_l18b_1p8>; + max-speed =3D <3200000>; + }; +}; + +&usb_1_hsphy { + vdda-pll-supply =3D <&vdd_a_usbhs_core>; + vdda33-supply =3D <&vdd_a_usbhs_3p1>; + vdda18-supply =3D <&vdd_a_usbhs_1p8>; +}; + +&usb_1_qmpphy { + vdda-phy-supply =3D <&vdd_a_usbssdp_0_1p2>; + vdda-pll-supply =3D <&vdd_a_usbssdp_0_core>; +}; + +&usb_2_hsphy { + vdda-pll-supply =3D <&vdd_a_usbhs_core>; + vdda33-supply =3D <&vdd_a_usbhs_3p1>; + vdda18-supply =3D <&vdd_a_usbhs_1p8>; +}; + +/* + * PINCTRL - ADDITIONS TO NODES IN PARENT DEVICE TREE FILES + * + * NOTE: In general if pins leave the Qcard then the pinctrl goes in the + * baseboard or board device tree, not here. + */ + +/* + * For ts_i2c + * + * Technically this i2c bus actually leaves the Qcard, but it leaves direc= tly + * via the eDP connector (it doesn't hit the baseboard). The external pulls + * are on Qcard. + */ +&qup_i2c13_data_clk { + /* Has external pull */ + bias-disable; + drive-strength =3D <2>; +}; + +/* For mos_bt_uart */ +&qup_uart7_cts { + /* Configure a pull-down on CTS to match the pull of the Bluetooth module= . */ + bias-pull-down; +}; + +/* For mos_bt_uart */ +&qup_uart7_rts { + /* We'll drive RTS, so no pull */ + bias-disable; + drive-strength =3D <2>; +}; + +/* For mos_bt_uart */ +&qup_uart7_tx { + /* We'll drive TX, so no pull */ + bias-disable; + drive-strength =3D <2>; +}; + +/* For mos_bt_uart */ +&qup_uart7_rx { + /* + * Configure a pull-up on RX. This is needed to avoid + * garbage data when the TX pin of the Bluetooth module is + * in tri-state (module powered off or not driving the + * signal yet). + */ + bias-pull-up; +}; + +/* eMMC, if stuffed, is straight on the Qcard */ +&sdc1_clk { + bias-disable; + drive-strength =3D <16>; +}; + +&sdc1_cmd { + bias-pull-up; + drive-strength =3D <10>; +}; + +&sdc1_data { + bias-pull-up; + drive-strength =3D <10>; +}; + +&sdc1_rclk { + bias-pull-down; +}; + +/* + * PINCTRL - QCARD + * + * This has entries that are defined by Qcard even if they go to the main + * board. In cases where the pulls may be board dependent we defer those + * settings to the board device tree. Drive strengths tend to be assinged = here + * but could conceivably be overwridden by board device trees. + */ + +&pm8350c_gpios { + pmic_edp_bl_en: pmic-edp-bl-en { + pins =3D "gpio7"; + function =3D "normal"; + bias-disable; + qcom,drive-strength =3D ; + + /* Force backlight to be disabled to match state at boot. */ + output-low; + }; + + pmic_edp_bl_pwm: pmic-edp-bl-pwm { + pins =3D "gpio8"; + function =3D "func1"; + bias-disable; + qcom,drive-strength =3D ; + output-low; + power-source =3D <0>; + }; +}; + +&tlmm { + mos_bt_en: mos-bt-en { + pins =3D "gpio85"; + function =3D "gpio"; + drive-strength =3D <2>; + output-low; + }; + + /* For mos_bt_uart */ + qup_uart7_sleep_cts: qup-uart7-sleep-cts { + pins =3D "gpio28"; + function =3D "gpio"; + /* + * Configure a pull-down on CTS to match the pull of + * the Bluetooth module. + */ + bias-pull-down; + }; + + /* For mos_bt_uart */ + qup_uart7_sleep_rts: qup-uart7-sleep-rts { + pins =3D "gpio29"; + function =3D "gpio"; + /* + * Configure pull-down on RTS. As RTS is active low + * signal, pull it low to indicate the BT SoC that it + * can wakeup the system anytime from suspend state by + * pulling RX low (by sending wakeup bytes). + */ + bias-pull-down; + }; + + /* For mos_bt_uart */ + qup_uart7_sleep_rx: qup-uart7-sleep-rx { + pins =3D "gpio31"; + function =3D "gpio"; + /* + * Configure a pull-up on RX. This is needed to avoid + * garbage data when the TX pin of the Bluetooth module + * is floating which may cause spurious wakeups. + */ + bias-pull-up; + }; + + /* For mos_bt_uart */ + qup_uart7_sleep_tx: qup-uart7-sleep-tx { + pins =3D "gpio30"; + function =3D "gpio"; + /* + * Configure pull-up on TX when it isn't actively driven + * to prevent BT SoC from receiving garbage during sleep. + */ + bias-pull-up; + }; + + ts_int_conn: ts-int-conn { + pins =3D "gpio55"; + function =3D "gpio"; + bias-pull-up; + }; + + ts_rst_conn: ts-rst-conn { + pins =3D "gpio54"; + function =3D "gpio"; + bias-pull-up; + drive-strength =3D <2>; + }; +}; --=20 2.35.0.rc2.247.g8bbb082509-goog From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3774AC433F5 for ; Wed, 2 Feb 2022 21:25:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347625AbiBBVZP (ORCPT ); Wed, 2 Feb 2022 16:25:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347543AbiBBVY4 (ORCPT ); Wed, 2 Feb 2022 16:24:56 -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 03302C06176F for ; Wed, 2 Feb 2022 13:24:30 -0800 (PST) Received: by mail-pf1-x431.google.com with SMTP id n32so395648pfv.11 for ; Wed, 02 Feb 2022 13:24:29 -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=DfTAOBXCjBVewSGVxZZh4ncHP9166sdZbwT93TYgXSc=; b=MAdtHmVuGIVNSqpDp0nNHdN1k+wbqPjJUswbpC3+KEtps5zrt3XBWF44qqWIMoTYhR SIk8ubwKkc0SXysg/FtaZc/+YLhzKZnk0vmoE14br2Ubi0XXIwir+hx16G8VN2wn9l4N z9XE6p1wwhwuNqvcXcDC13S+e5zDovBkxAKrQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DfTAOBXCjBVewSGVxZZh4ncHP9166sdZbwT93TYgXSc=; b=vyQUkcVDzTrrb6/xUW3abodsTcaZkCDpfp5VzoHgCsC/hr2T+g6Rc72LwbkQsJvuSA RwIHP8MfFxY7M+BSs3Pyf8hiTTNFVSn6ZSWLpuSqahKJkIOzXzgkl+N4KWvsAOVnwjdb WNzYrdXodsHfuG0uRgcIzGpIZ5KmFb2/epBLmPn5Mk5xCSAhxk22Fz15GxxDxTIDfxZN OK58vHbf2gkAMiDr+osRCNZT5tN8kQbWtkMluMLRAi6VR3XGbGDB33euxeYePcjZLqQp J2uk8eEVKZppUuAx4BfadQ5+oEMttDoZFBtsP6kfddn9UzCN9+V80FVjJP6fM5x1ghwV eI8w== X-Gm-Message-State: AOAM531pRj6FLZ+/I2jODmDiTpWGZhtIUrk4K/1xEecF4B3M9OPJy95n FzInyrJnL9EzPCoJazdshN8p0Q== X-Google-Smtp-Source: ABdhPJyEIHWi0WajO1afZwfbNpuVBL+JYwF12qrEy6YYWgEsC2fifgouNPin6CXQPSLoxjPMCOb3qw== X-Received: by 2002:aa7:96c1:: with SMTP id h1mr31506213pfq.17.1643837069500; Wed, 02 Feb 2022 13:24:29 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:f1c4:10b6:b4ef:16e5]) by smtp.gmail.com with ESMTPSA id on9sm7627983pjb.16.2022.02.02.13.24.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 13:24:29 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: pmaliset@codeaurora.org, mka@chromium.org, quic_rjendra@quicinc.com, Shaik Sajida Bhanu , kgodara@codeaurora.org, konrad.dybcio@somainline.org, Sankeerth Billakanti , sibis@codeaurora.org, swboyd@chromium.org, Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 13/14] arm64: dts: qcom: sc7280: Add the CPU compatible to the soc@0 node Date: Wed, 2 Feb 2022 13:23:47 -0800 Message-Id: <20220202132301.v3.13.I7924ce4592e3e75b2293804d8a3f8a4dae44646e@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220202212348.1391534-1-dianders@chromium.org> References: <20220202212348.1391534-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" We'd like to start including the CPU name as the compatible under the "soc" node so that we can get rid of it from the top-level compatible string. Suggested-by: Stephen Boyd Signed-off-by: Douglas Anderson --- Probably needs a .yaml file somewhere? Changes in v3: - ("sc7280: Add the CPU compatible to the soc@0 node") new for v3. arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qco= m/sc7280.dtsi index 618ae0407cd6..2bfc919d4018 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -573,7 +573,7 @@ soc: soc@0 { #size-cells =3D <2>; ranges =3D <0 0 0 0 0x10 0>; dma-ranges =3D <0 0 0 0 0x10 0>; - compatible =3D "simple-bus"; + compatible =3D "qcom,sc7280", "simple-bus"; =20 gcc: clock-controller@100000 { compatible =3D "qcom,gcc-sc7280"; --=20 2.35.0.rc2.247.g8bbb082509-goog From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7AF03C433EF for ; Wed, 2 Feb 2022 21:25:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347650AbiBBVZT (ORCPT ); Wed, 2 Feb 2022 16:25:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347615AbiBBVY5 (ORCPT ); Wed, 2 Feb 2022 16:24:57 -0500 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92DBCC061772 for ; Wed, 2 Feb 2022 13:24:31 -0800 (PST) Received: by mail-pf1-x434.google.com with SMTP id n32so395713pfv.11 for ; Wed, 02 Feb 2022 13:24:31 -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=xgg1dp8iZIsd+ETCYJ0M68uoTZDyXRB08KQ/Cr5C+0g=; b=jJil91MNL66Di0WHLj5CZNOwHdFxsSluO5E2F76en2J92DKcCVE9eSiNnZTyJjBLJ2 rqt1E3ICHhc1AnwXYaaCrT052qPsQFd8w5bHGHl/2hnDi/s7ktwW3J9yk20yObSyyaaw KaiWU5gzVtjMtFjcuE1EFyv0BqYV14X6UsDeM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xgg1dp8iZIsd+ETCYJ0M68uoTZDyXRB08KQ/Cr5C+0g=; b=SlR0adSKJuxGY8/w8pQp7C+pK/8X2rOwMqZMh391PetJJVDjbcuAKMIQVXgg1of1sF PH6IB9mKtxqSBIlhx8EhNAY+2jlC3SCuZymEUbSRXZXIP4pQMSWWQm0SsMBN3sFOKnuO psiBdXxzw4UvCaRns4068GaerkGrVkMo8auNoAL0uaaHJHwJ4JaxbHzgu+B3kDc2e+Nr VNo/GuG+N5C3jsFzUra9AaU59BsElOAWrOoxIPDwjDxIVbU2EDIRk04NARptvQsQ3lj6 AWGND5q8QsGWcE620tgiSmzdQLYblD/+70u6zxSpnNtCiQhCGugmqNCyEbvYjNposXQP vOpQ== X-Gm-Message-State: AOAM533tp26vt1+8de/vRxvoQqgKdex8TnHZjGcjPsfjnRFnhUlL21xA xu2sRjL4vxOrSVmN/0MoVwiIWw== X-Google-Smtp-Source: ABdhPJw4qyyEfRlRvLGjf9dyeGJMDo9ZYtO0cDt9GMuJ6Cyv7WVK/16uYQ73EEBPLrg91h0K/xFs6g== X-Received: by 2002:a05:6a00:179d:: with SMTP id s29mr520866pfg.16.1643837071050; Wed, 02 Feb 2022 13:24:31 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:f1c4:10b6:b4ef:16e5]) by smtp.gmail.com with ESMTPSA id on9sm7627983pjb.16.2022.02.02.13.24.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 13:24:30 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: pmaliset@codeaurora.org, mka@chromium.org, quic_rjendra@quicinc.com, Shaik Sajida Bhanu , kgodara@codeaurora.org, konrad.dybcio@somainline.org, Sankeerth Billakanti , sibis@codeaurora.org, swboyd@chromium.org, Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 14/14] arm64: dts: qcom: sc7280: Remove "qcom,sc7280" from top-level of boards Date: Wed, 2 Feb 2022 13:23:48 -0800 Message-Id: <20220202132301.v3.14.I4ebe7533f00324213d224efc7267ebd16fd6f253@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220202212348.1391534-1-dianders@chromium.org> References: <20220202212348.1391534-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" There's a proposal to take the SoC name out of the top-level compatible and move it under the "soc@0" node. Building on the patch ("arm64: dts: qcom: sc7280: Add the CPU compatible to the soc@0 node"), which added this to the soc@0 node, this removes it from the top-level node. NOTE: while the previous patch could land at any time without any compatibility issues, this patch will cause problems without a code change to the cpufreq driver [1]. [1] https://lore.kernel.org/r/CAE-0n50sX9-0MxcpF+3Rwqm75jSw5=3DaNwdsitLwE2s= EA69jLJw@mail.gmail.com Suggested-by: Stephen Boyd Signed-off-by: Douglas Anderson --- Not for commiting right now since we'd need the corresponding code change. Changes in v3: - ("Remove "qcom,sc7280" from top-level") patch new for v3. arch/arm64/boot/dts/qcom/sc7280-crd.dts | 2 +- arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts | 2 +- arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts | 2 +- arch/arm64/boot/dts/qcom/sc7280-idp.dts | 2 +- arch/arm64/boot/dts/qcom/sc7280-idp2.dts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-crd.dts b/arch/arm64/boot/dts/= qcom/sc7280-crd.dts index e2efbdde53a3..f02cda91675c 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-crd.dts @@ -12,7 +12,7 @@ =20 / { model =3D "Qualcomm Technologies, Inc. sc7280 CRD platform"; - compatible =3D "qcom,sc7280-crd", "google,hoglin", "qcom,sc7280"; + compatible =3D "qcom,sc7280-crd", "google,hoglin"; =20 aliases { serial0 =3D &uart5; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts b/a= rch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts index f7d4adeae90c..c40ccb1dc429 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts @@ -25,7 +25,7 @@ =20 / { model =3D "Google Herobrine (rev0)"; - compatible =3D "google,herobrine-rev0", "qcom,sc7280"; + compatible =3D "google,herobrine-rev0"; }; =20 / { diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts b/a= rch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts index f95273052da0..8d993bba4389 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts @@ -11,7 +11,7 @@ =20 / { model =3D "Google Herobrine (rev1+)"; - compatible =3D "google,herobrine", "qcom,sc7280"; + compatible =3D "google,herobrine"; }; =20 /* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */ diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dts b/arch/arm64/boot/dts/= qcom/sc7280-idp.dts index a7be133a782f..7f3c8189555e 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts @@ -13,7 +13,7 @@ =20 / { model =3D "Qualcomm Technologies, Inc. sc7280 IDP SKU1 platform"; - compatible =3D "qcom,sc7280-idp", "google,senor", "qcom,sc7280"; + compatible =3D "qcom,sc7280-idp", "google,senor"; =20 aliases { serial0 =3D &uart5; diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp2.dts b/arch/arm64/boot/dts= /qcom/sc7280-idp2.dts index 73b9911dd802..004925fd896e 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp2.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-idp2.dts @@ -12,7 +12,7 @@ =20 / { model =3D "Qualcomm Technologies, Inc. sc7280 IDP SKU2 platform"; - compatible =3D "qcom,sc7280-idp2", "google,piglin", "qcom,sc7280"; + compatible =3D "qcom,sc7280-idp2", "google,piglin"; =20 aliases { serial0 =3D &uart5; --=20 2.35.0.rc2.247.g8bbb082509-goog