From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> To: Andy Gross <agross@kernel.org>, Bjorn Andersson <bjorn.andersson@linaro.org>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, Marijn Suijten <marijn.suijten@somainline.org> Subject: [PATCH v7 09/11] arm64: dts: qcom: sdm660: move SDHC2 card detect pinconf to board files Date: Sat, 21 May 2022 23:27:06 +0300 [thread overview] Message-ID: <20220521202708.1509308-10-dmitry.baryshkov@linaro.org> (raw) In-Reply-To: <20220521202708.1509308-1-dmitry.baryshkov@linaro.org> This results in dts duplication, but per mutual agreement card detect pin configuration belongs to the board files. Move it from the SoC dtsi to the board DT files. Suggested-by: Marijn Suijten <marijn.suijten@somainline.org> Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 16 ++++++++++++++++ arch/arm64/boot/dts/qcom/sdm630.dtsi | 12 ------------ .../boot/dts/qcom/sdm660-xiaomi-lavender.dts | 16 ++++++++++++++++ 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi index 00baacf28c63..ccde9951e4fb 100644 --- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi @@ -549,6 +549,22 @@ vreg_l19a_3p3: l19 { }; }; +&sdc2_state_on { + sd-cd { + pins = "gpio54"; + bias-pull-up; + drive-strength = <2>; + }; +}; + +&sdc2_state_off { + sd-cd { + pins = "gpio54"; + bias-disable; + drive-strength = <2>; + }; +}; + &sdhc_1 { status = "okay"; supports-cqe; diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index 1c887b9055b3..55de345895e6 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -983,12 +983,6 @@ data { bias-pull-up; drive-strength = <10>; }; - - sd-cd { - pins = "gpio54"; - bias-pull-up; - drive-strength = <2>; - }; }; sdc2_state_off: sdc2-off { @@ -1009,12 +1003,6 @@ data { bias-pull-up; drive-strength = <2>; }; - - sd-cd { - pins = "gpio54"; - bias-disable; - drive-strength = <2>; - }; }; }; diff --git a/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts b/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts index 9280c1f0c334..2b1216502eb0 100644 --- a/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts +++ b/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts @@ -363,6 +363,22 @@ vreg_l19a_3p3: l19 { }; }; +&sdc2_state_on { + sd-cd { + pins = "gpio54"; + bias-pull-up; + drive-strength = <2>; + }; +}; + +&sdc2_state_off { + sd-cd { + pins = "gpio54"; + bias-disable; + drive-strength = <2>; + }; +}; + &sdhc_1 { status = "okay"; supports-cqe; -- 2.35.1
next prev parent reply other threads:[~2022-05-21 20:27 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-21 20:26 [PATCH v7 00/11] arm64: dts: qcom: initial Inforce IFC6560 board support Dmitry Baryshkov 2022-05-21 20:26 ` [PATCH v7 01/11] arm64: dts: qcom: sdm630: disable dsi0/dsi0_phy by default Dmitry Baryshkov 2022-05-21 20:26 ` [PATCH v7 02/11] arm64: dts: qcom: sdm660: disable dsi1/dsi1_phy " Dmitry Baryshkov 2022-05-21 20:27 ` [PATCH v7 03/11] arm64: dts: qcom: sdm630: disable GPU " Dmitry Baryshkov 2022-05-21 20:27 ` [PATCH v7 04/11] arm64: dts: qcom: sdm630: fix the qusb2phy ref clock Dmitry Baryshkov 2022-05-21 20:27 ` [PATCH v7 05/11] arm64: dts: qcom: sdm630: rename qusb2phy to qusb2phy0 Dmitry Baryshkov 2022-05-21 20:27 ` [PATCH v7 06/11] arm64: dts: qcom: sdm630: add second (HS) USB host support Dmitry Baryshkov 2022-05-21 20:27 ` [PATCH v7 07/11] arm64: dts: qcom: sdm630: fix gpu's interconnect path Dmitry Baryshkov 2022-05-21 20:27 ` [PATCH v7 08/11] arm64: dts: qcom: sdm636-sony-xperia-ganges-mermaid: correct sdc2 pinconf Dmitry Baryshkov 2022-05-22 22:22 ` Marijn Suijten 2022-05-21 20:27 ` Dmitry Baryshkov [this message] 2022-05-21 20:27 ` [PATCH v7 10/11] dt-bindings: arm: qcom: document sda660 SoC and ifc6560 board Dmitry Baryshkov 2022-05-24 2:04 ` Rob Herring 2022-05-21 20:27 ` [PATCH v7 11/11] arm64: dts: qcom: sdm660: Add initial Inforce IFC6560 board support Dmitry Baryshkov 2022-07-03 3:56 ` [PATCH v7 00/11] arm64: dts: qcom: " Bjorn Andersson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220521202708.1509308-10-dmitry.baryshkov@linaro.org \ --to=dmitry.baryshkov@linaro.org \ --cc=agross@kernel.org \ --cc=bjorn.andersson@linaro.org \ --cc=devicetree@vger.kernel.org \ --cc=krzysztof.kozlowski+dt@linaro.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=marijn.suijten@somainline.org \ --cc=robh+dt@kernel.org \ --subject='Re: [PATCH v7 09/11] arm64: dts: qcom: sdm660: move SDHC2 card detect pinconf to board files' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.