From: Konrad Dybcio <konrad.dybcio@somainline.org>
To: ~postmarketos/upstreaming@lists.sr.ht
Cc: martin.botka@somainline.org,
angelogioacchino.delregno@somainline.org,
marijn.suijten@somainline.org, jamipkettunen@somainline.org,
Konrad Dybcio <konrad.dybcio@somainline.org>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] arm64: dts: qcom: qrb5165-rb5: Fix up pins
Date: Sun, 13 Jun 2021 22:17:54 +0200 [thread overview]
Message-ID: <20210613201754.346440-1-konrad.dybcio@somainline.org> (raw)
In-Reply-To: <20210612192358.62602-2-konrad.dybcio@somainline.org>
In the SDHCI pin commonization commit I overlooked the fact that this
board had the pins defined in its own DT. Revert their settings to the
original values.
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 38 ++++++++----------------
arch/arm64/boot/dts/qcom/sm8250.dtsi | 4 +--
2 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
index a5b742325261..bf05328f3901 100644
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
@@ -858,6 +858,18 @@ dai@2 {
};
};
+&sdc2_card_det_n {
+ /delete-property/ drive-strength;
+};
+
+&sdc2_cmd_default {
+ drive-strength = <10>;
+};
+
+&sdc2_data_default {
+ drive-strength = <10>;
+};
+
&sdhc_2 {
status = "okay";
pinctrl-names = "default";
@@ -1253,32 +1265,6 @@ wake-n {
bias-pull-up;
};
};
-
- sdc2_default_state: sdc2-default {
- clk {
- pins = "sdc2_clk";
- bias-disable;
- drive-strength = <16>;
- };
-
- cmd {
- pins = "sdc2_cmd";
- bias-pull-up;
- drive-strength = <10>;
- };
-
- data {
- pins = "sdc2_data";
- bias-pull-up;
- drive-strength = <10>;
- };
- };
-
- sdc2_card_det_n: sd-card-det-n {
- pins = "gpio77";
- function = "gpio";
- bias-pull-up;
- };
};
&uart12 {
diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index fe858abbff5d..fab5d83f4496 100644
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -3414,13 +3414,13 @@ clk {
bias-disable;
};
- cmd {
+ sdc2_cmd_default: cmd {
pins = "sdc2_cmd";
drive-strength = <16>;
bias-pull-up;
};
- data {
+ sdc2_data_default: data {
pins = "sdc2_data";
drive-strength = <16>;
bias-pull-up;
--
2.32.0
next prev parent reply other threads:[~2021-06-13 20:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-12 19:23 [PATCH v2 1/3] arm64: dts: qcom: sm8250: Disable Adreno and Venus by default Konrad Dybcio
2021-06-12 19:23 ` [PATCH v2 2/3] arm64: dts: qcom: sm8250: Add SDHCI2 pinctrl Konrad Dybcio
2021-06-13 20:17 ` Konrad Dybcio [this message]
2021-06-15 23:39 ` Bjorn Andersson
2021-06-12 19:23 ` [PATCH v2 3/3] arm64: dts: qcom: Add support for SONY Xperia 1 II / 5 II (Edo platform) Konrad Dybcio
2021-06-15 7:35 ` Marijn Suijten
2021-06-15 23:45 ` Bjorn Andersson
2021-06-15 23:51 ` Konrad Dybcio
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=20210613201754.346440-1-konrad.dybcio@somainline.org \
--to=konrad.dybcio@somainline.org \
--cc=agross@kernel.org \
--cc=angelogioacchino.delregno@somainline.org \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=jamipkettunen@somainline.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marijn.suijten@somainline.org \
--cc=martin.botka@somainline.org \
--cc=robh+dt@kernel.org \
--cc=~postmarketos/upstreaming@lists.sr.ht \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).