From nobody Mon Jun 29 23:24:01 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 9AF0DC4167B for ; Tue, 1 Feb 2022 00:11:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230183AbiBAALJ (ORCPT ); Mon, 31 Jan 2022 19:11:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230189AbiBAALH (ORCPT ); Mon, 31 Jan 2022 19:11:07 -0500 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1671CC06173D for ; Mon, 31 Jan 2022 16:11:07 -0800 (PST) Received: by mail-pj1-x1031.google.com with SMTP id l24-20020a17090aec1800b001b55738f633so620113pjy.1 for ; Mon, 31 Jan 2022 16:11:07 -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=9+cijBLvhJxxRYTV1vDRfsp76gMHCb5POk8j3TEiH8M=; b=Jm2CaDN2N7qqGbiD2LddLHmzL00xLkXv3Y3pOSGVcnR7GXM8amxWj2yM/Sle/RNG+S f0i0SumDRisGYCqyxMGl4b1wnjKO3oBK8VAKQEOjXmriLtMaL4N+usgJvc2y7F532veE IEZcTA3+GAq//gjof5wktp2Ofbrf2vXKPkBuA= 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=9+cijBLvhJxxRYTV1vDRfsp76gMHCb5POk8j3TEiH8M=; b=A5lpg5JC/KR3pe8OoiyS7542hyvhj3RO17nxWx92PPZc9jtoUHu+41py2HTx0gyiNW xgL/INKAlrY7JgS3acqOiLRe6KM04qcNKcW0qE2oXEPoQ0ZnmJJ5LOMGD3jNbra9fl3F 0AodEvaoj4LttewcLewJQsy36mhHmbZBrTIonpxPATTjOpB0M+gcSdIDR+6gl+3gW5dV ePo79YvQxk1isB+HS4znpfF3JauM84rtlcJ2mjJSyBbY3sdgrBBxFhBXmLu8IxXAQYPO Z4CrK159TXxIUXvOBv0/KjTT3pxQMbA04kUtZw7LmJueOKPUivbu4SoBvCwmsG3PWpOv Wcwg== X-Gm-Message-State: AOAM5334ACmkvvHv/gqSgKLAMqAtBGcNIyDvauGOsBK8w7kTKSTVYdag l1GVi/czlp5ERSc/w0H9YOqD4w== X-Google-Smtp-Source: ABdhPJxTTHmLgX2FBxja2v32QILtVmEmRq+EQJCtJOkQ8TcW1LZIjWolmzbSDg7hA1u4ZNmSzIyxrw== X-Received: by 2002:a17:90b:4c43:: with SMTP id np3mr36977906pjb.88.1643674266633; Mon, 31 Jan 2022 16:11:06 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:c47e:986d:769b:ead2]) by smtp.gmail.com with ESMTPSA id oj5sm424024pjb.53.2022.01.31.16.11.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jan 2022 16:11:06 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Shaik Sajida Bhanu , mka@chromium.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 1/5] arm64: dts: qcom: sc7180-trogdor: Add "-regulator" suffix to pp3300_hub Date: Mon, 31 Jan 2022 16:10:38 -0800 Message-Id: <20220131161034.1.I7b284531f1c992932f7eef8abaf7cc5548064f33@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220201001042.3724523-1-dianders@chromium.org> References: <20220201001042.3724523-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 --- 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 23:24:01 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 851DEC433EF for ; Tue, 1 Feb 2022 00:11:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230220AbiBAALK (ORCPT ); Mon, 31 Jan 2022 19:11:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230163AbiBAALI (ORCPT ); Mon, 31 Jan 2022 19:11:08 -0500 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3637BC061714 for ; Mon, 31 Jan 2022 16:11:08 -0800 (PST) Received: by mail-pl1-x62a.google.com with SMTP id x11so13963545plg.6 for ; Mon, 31 Jan 2022 16:11:08 -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=ATL74pFESfBpBVkQXmsV4M2B6h+NphNUg0/LX0n/suU=; b=h3DcTNAWfgElvVoq8kYYU5k4CozfcdTudPNkViRPOW6T/plEnptuS9DhnNp9hD3+26 /ubmJjU5uwzh+WhRIw0vAfFbbI9rnjJzmPMoguc2P6PRjFJHmaCIXtnbzAULIJknQRoh lUk0gnvImCcdWp26S3tOuuCQZ3IEfcBQ7ARkM= 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=ATL74pFESfBpBVkQXmsV4M2B6h+NphNUg0/LX0n/suU=; b=OMXhooMRqFjLZD/OA9CrFM5OXB+adNH1Y9c3WrzdpGwbu/u+yeOF/5ZdgsLBtMn0Yt MQYLmZO6C72RE1U6kEmay1rsSFr0XqCbgKN2VN9N0HUN9wXQzURkp97TuDRKQHm0Uxn5 BcuvYlbJl2L0ii8S1OvtmkYvjjgXLp8XC/5p8n/tXzxgmMpWwvikSJCzqPYt6vEJBP1m Fjxpg1ckwK2b0DXP+51+GQ05f4Ne/y7ClbKlCyGUwlUyXgRAtXMVW07ldzhz2k0Z2yRw jPYQl5VRrJixENyUiygM9xbOey+nRsEeotCHMFeevf8SU+yi3y9xj4xVaWmCeSzGh2l9 3bgA== X-Gm-Message-State: AOAM530dXKP6urUKAsc/Mi/oIQyH+e7ecTXdhsPYxE+NBem+A/xjXqef 5WBRxH7MW0CZPZxQA7ka9G/oxQ== X-Google-Smtp-Source: ABdhPJzhky1qBnKtaQyj3xSaMT0/Zj9SsDM2eX3bv60kHevdwHpSMajshCbIocivJ9mxXf2PiajP/Q== X-Received: by 2002:a17:902:be0e:: with SMTP id r14mr9962675pls.121.1643674267763; Mon, 31 Jan 2022 16:11:07 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:c47e:986d:769b:ead2]) by smtp.gmail.com with ESMTPSA id oj5sm424024pjb.53.2022.01.31.16.11.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jan 2022 16:11:07 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Shaik Sajida Bhanu , mka@chromium.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 2/5] arm64: dts: qcom: sc7280-herobrine: Consistently add "-regulator" suffix Date: Mon, 31 Jan 2022 16:10:39 -0800 Message-Id: <20220131161034.2.I627e60c5488d54a45fd1482ca19f0f6e45192db2@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220201001042.3724523-1-dianders@chromium.org> References: <20220201001042.3724523-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 --- .../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 23:24:01 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 C98ACC433F5 for ; Tue, 1 Feb 2022 00:11:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230221AbiBAALN (ORCPT ); Mon, 31 Jan 2022 19:11:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230215AbiBAALJ (ORCPT ); Mon, 31 Jan 2022 19:11:09 -0500 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52FB6C06173B for ; Mon, 31 Jan 2022 16:11:09 -0800 (PST) Received: by mail-pj1-x1029.google.com with SMTP id h20-20020a17090adb9400b001b518bf99ffso844507pjv.1 for ; Mon, 31 Jan 2022 16:11:09 -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=jbIE4iuiA0p3DjnEE2VhYT924iZ27y8GMOMWERDoj6A=; b=OUWPsi1/Y+JAKuLZjECoWQW2sonq0TknP/4cgf4+0y+2uLXtC184hrb1QN5+CWKCMy pxYL3AhhLDG61jFr+SdrYuMzufh7y7MDyr5ImVL7NkepEPmmV4NI59U3cmrPnqY3dfMn mDFW0uRrAzFmwzv81yqUN+LV+r62ytVic0LYk= 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=jbIE4iuiA0p3DjnEE2VhYT924iZ27y8GMOMWERDoj6A=; b=OP6C+ig3bM5PESB006nfmAynfOwXlS6I5n/zhFM5xtdxHsJtl4nMub/WA1iRayo5EC VrxXYIGbLg48PnjaQCesuoUWWCNQiU+J1y8feKIcRvr8z+xdSBsw6NFCvk5Vbkrj4Axq 2MFetqqBHY/wwOjPffaDQ7BV9CXscljeGglJOLhYDpqqYdhJbkc27V7EkPkRiI/h16xD ExH8EUzjpKDHNlP9DgXbjzRLmyOKDUu+gjSvAOEOqEUQqK6yqe7deKpVFsla+aBdhFFe l3THTxMPw9Qrrx9aJKAjkVCLp4XGHUKeW5yG17hG71nt5zSfuF6X+AR7EGIztiqiBbHO MDAw== X-Gm-Message-State: AOAM532n5YEafrfGA7aQ61Ycb8tppXUZWSOXQkiZu26mH0JDbJKYZfUa MfR5QX9g35WrsoyApDybqIBIOw== X-Google-Smtp-Source: ABdhPJzk2QTnYgsMXAr7flyx95am+/DRTFm1A6vcXKURNula+eGCbfoSDdW9gaIfKX83NuPzNJWM9A== X-Received: by 2002:a17:90b:1c0f:: with SMTP id oc15mr29904694pjb.17.1643674268851; Mon, 31 Jan 2022 16:11:08 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:c47e:986d:769b:ead2]) by smtp.gmail.com with ESMTPSA id oj5sm424024pjb.53.2022.01.31.16.11.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jan 2022 16:11:08 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Shaik Sajida Bhanu , mka@chromium.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 3/5] arm64: dts: qcom: sc7280: Properly sort sdc pinctrl lines Date: Mon, 31 Jan 2022 16:10:40 -0800 Message-Id: <20220131161034.3.I6ae594129a8ad3d18af9f5ebffd895b4f6353a0a@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220201001042.3724523-1-dianders@chromium.org> References: <20220201001042.3724523-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 --- 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 23:24:01 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 7607BC433F5 for ; Tue, 1 Feb 2022 00:11:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230294AbiBAALO (ORCPT ); Mon, 31 Jan 2022 19:11:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230239AbiBAALK (ORCPT ); Mon, 31 Jan 2022 19:11:10 -0500 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D4BEC06173E for ; Mon, 31 Jan 2022 16:11:10 -0800 (PST) Received: by mail-pl1-x62f.google.com with SMTP id h14so13986561plf.1 for ; Mon, 31 Jan 2022 16:11:10 -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=e2qTb00lKiTZbvmTcgDQQgeFKRB9BF1Drl7IvQqo+cg=; b=Qqzjx7djR6Dqxaw9s/JBaAqWtti0yVDIuEf/ZUdPXYgkh3JQeIDA3HLbXa9APQZKAJ tke3KDV80cr6Q5yKcL9zTjMgR0nsmxyB9EkicRd7TNYHYwny/iKkJu3LBzMW3BNxlfZx tQtkfAFe9JZkdrh17IY2iTeI7Tkv2OSCieSTU= 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=e2qTb00lKiTZbvmTcgDQQgeFKRB9BF1Drl7IvQqo+cg=; b=jZudsMR8AricjNWFkOLw7+BdPOrwh6/s323800RKkhsxmefMyxrCK7+YMy2Ue9jK8a Q905pKtOnHisn1gnukyBsMY2totyiDiUn87BazM5NJ3gPfunYglhzhBwCZexx0oUudTA SsQxXuC1Tu0w1ODv8fgrOSMnCPML6huhNYovLhmS/Y16nJtW1L+uJLoropuUIAa9jdgb UkdTplnaoDNu7VUEM7ITHbnIaXTmCtMZgXhbo+9qdX7vqKFFCMRUYOFgaQzVp0RhBlRW zvXAEXx9EqkYNFgohduOW6QX+ivhd+R1QHOmM6ttGXiypMj1t/HvFMG5/FEVlsIj8zTE aeyg== X-Gm-Message-State: AOAM532t/x3Vbx4cGOrp0CxmqQrL/1zAzzSoY2z6rR1CAJuv3zatH/J8 dQhO2Y6YYN+kGJThhQEgFNmOTg== X-Google-Smtp-Source: ABdhPJwTs5SF6eAYyOLVKzV1c3bJYrEzS3dohfA2UPTY/3jBypPjbUBNaNbEkmWvbmgtF8SmDJUryg== X-Received: by 2002:a17:902:7791:: with SMTP id o17mr14196308pll.107.1643674270003; Mon, 31 Jan 2022 16:11:10 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:c47e:986d:769b:ead2]) by smtp.gmail.com with ESMTPSA id oj5sm424024pjb.53.2022.01.31.16.11.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jan 2022 16:11:09 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Shaik Sajida Bhanu , mka@chromium.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 4/5] arm64: dts: qcom: sc7280: Clean up sdc1 / sdc2 pinctrl Date: Mon, 31 Jan 2022 16:10:41 -0800 Message-Id: <20220131161034.4.I79baad7f52351aafb470f8b21a9fa79d7031ad6a@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220201001042.3724523-1-dianders@chromium.org> References: <20220201001042.3724523-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 --- .../qcom/sc7280-herobrine-herobrine-r0.dts | 73 +++++------ arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 91 +++++++------- arch/arm64/boot/dts/qcom/sc7280.dtsi | 119 +++++++++--------- 3 files changed, 135 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..dc98a87e2871 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,76 @@ qup_uart15_rx: qup-uart15-rx { function =3D "qup17"; }; =20 - sdc1_on: sdc1-on { - clk { - pins =3D "sdc1_clk"; - }; =20 - cmd { - pins =3D "sdc1_cmd"; - }; =20 - data { - pins =3D "sdc1_data"; - }; + sdc1_clk: sdc1-clk { + pins =3D "sdc1_clk"; + }; =20 - rclk { - pins =3D "sdc1_rclk"; - }; + sdc1_cmd: sdc1-cmd { + pins =3D "sdc1_cmd"; }; =20 - sdc1_off: sdc1-off { - clk { - pins =3D "sdc1_clk"; - drive-strength =3D <2>; - bias-bus-hold; - }; + sdc1_data: sdc1-data { + pins =3D "sdc1_data"; + }; =20 - cmd { - pins =3D "sdc1_cmd"; - drive-strength =3D <2>; - bias-bus-hold; - }; + sdc1_rclk: sdc1-rclk { + pins =3D "sdc1_rclk"; + }; =20 - data { - pins =3D "sdc1_data"; - 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 - rclk { - pins =3D "sdc1_rclk"; - bias-bus-hold; - }; + sdc1_cmd_sleep: sdc1-cmd-sleep { + pins =3D "sdc1_cmd"; + drive-strength =3D <2>; + bias-bus-hold; }; =20 - sdc2_on: sdc2-on { - clk { - pins =3D "sdc2_clk"; - }; + sdc1_data_sleep: sdc1-data-sleep { + pins =3D "sdc1_data"; + drive-strength =3D <2>; + bias-bus-hold; + }; =20 - cmd { - pins =3D "sdc2_cmd"; - }; + sdc1_rclk_sleep: sdc1-rclk-sleep { + pins =3D "sdc1_rclk"; + drive-strength =3D <2>; + bias-bus-hold; + }; =20 - data { - pins =3D "sdc2_data"; - }; + sdc2_clk: sdc2-clk { + pins =3D "sdc2_clk"; }; =20 - sdc2_off: sdc2-off { - clk { - pins =3D "sdc2_clk"; - drive-strength =3D <2>; - bias-bus-hold; - }; + sdc2_cmd: sdc2-cmd { + pins =3D "sdc2_cmd"; + }; =20 - cmd { - pins =3D"sdc2_cmd"; - drive-strength =3D <2>; - bias-bus-hold; - }; + sdc2_data: sdc2-data { + pins =3D "sdc2_data"; + }; =20 - data { - pins =3D"sdc2_data"; - drive-strength =3D <2>; - bias-bus-hold; - }; + sdc2_clk_sleep: sdc2-clk-sleep { + pins =3D "sdc2_clk"; + drive-strength =3D <2>; + bias-bus-hold; + }; + + sdc2_cmd_sleep: sdc2-cmd-sleep { + pins =3D "sdc2_cmd"; + 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 23:24:01 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 77FADC433EF for ; Tue, 1 Feb 2022 00:11:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230318AbiBAALU (ORCPT ); Mon, 31 Jan 2022 19:11:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230225AbiBAALL (ORCPT ); Mon, 31 Jan 2022 19:11:11 -0500 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98C6DC06173D for ; Mon, 31 Jan 2022 16:11:11 -0800 (PST) Received: by mail-pl1-x62b.google.com with SMTP id z5so13944914plg.8 for ; Mon, 31 Jan 2022 16:11: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=BLyJY/CY058PdC6QzTbbwc0EGXgTrNIX9qqqeiwTwrw=; b=ayCvbNcKiPTczzqS9XHoyUnHjt4Z3nLj6ZGXwOxIZHj6AF48fpi0jxqXunWsnufBUJ XP/rpS0IRJa7HQ5OYPiMUxZL2ggXFfQABDoOVt/d0X+AFqc3zWrCT807UUnffnB4gxQe SW78/BW7hd2R0hYUJE5RfhI+c+gqz2DaYciDg= 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=BLyJY/CY058PdC6QzTbbwc0EGXgTrNIX9qqqeiwTwrw=; b=EQ+d6tOtfqqWjj/eBU8vmD0lyoWGcxhtNmPLBD8jrHDBKirGWpct5EalpqYeUWd4vo lWUiAznxhS0geDcX8K1aJGvUzfITjHDn3EQnpAz7y+gV4mlYbDb/RuoUfjk3W4Vg+CK6 OmPqtE22I5EybDLYojN0y11wRjeuIIz50tcdH+9S6acz6qyQEMV+Uim/utTQOsIi21iP qc0/2kX9pFS8bUcutFzVUgCR/Z0QSwIBOgbbnKaB927hbIlt4uS4FKxralYTze9NqfmT Tb6lnHe913jqYq6vOsE/WWdrDwoy+0ZohHKnbRgnHeYC7H6gBWAlu+wvHksQdyDauDej owWA== X-Gm-Message-State: AOAM532Q/z5aAxne4kC8+zE+NA3AnJfZxOoQ4Br4ymrf4GMd5dirZAs6 tUrC00lA48ThJ1bmvEaSldzaoQ== X-Google-Smtp-Source: ABdhPJzhPbukCAQnFB32y0r3lP+C+C9GoEC9M2CC+qRHwEeEZZNueWtJOl6DIlqw6o8Q3YFKVs9uEg== X-Received: by 2002:a17:902:6b0b:: with SMTP id o11mr5876923plk.169.1643674271194; Mon, 31 Jan 2022 16:11:11 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:c47e:986d:769b:ead2]) by smtp.gmail.com with ESMTPSA id oj5sm424024pjb.53.2022.01.31.16.11.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jan 2022 16:11:10 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Shaik Sajida Bhanu , mka@chromium.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 5/5] arm64: dts: qcom: sc7280-idp: No need for "input-enable" on sw_ctrl Date: Mon, 31 Jan 2022 16:10:42 -0800 Message-Id: <20220131161034.5.Ibaf8a803802beb089cc6266b37e6156cff3ddaec@changeid> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220201001042.3724523-1-dianders@chromium.org> References: <20220201001042.3724523-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 --- 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