From: Evan Green <evgreen@chromium.org>
To: Andy Gross <andy.gross@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Douglas Anderson <dianders@chromium.org>,
Evan Green <evgreen@chromium.org>,
devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org,
David Brown <david.brown@linaro.org>,
Mark Rutland <mark.rutland@arm.com>
Subject: [PATCH v2 3/3] arm64: dts: qcom: sdm845: Add SD nodes for sdm845-mtp
Date: Thu, 6 Dec 2018 10:45:22 -0800 [thread overview]
Message-ID: <20181206184522.118062-4-evgreen@chromium.org> (raw)
In-Reply-To: <20181206184522.118062-1-evgreen@chromium.org>
Enable support for one of the micro SD slots on the MTP.
Signed-off-by: Evan Green <evgreen@chromium.org>
---
Changes in v2:
- Fixed alphabetization of node placement in sdm845-mtp.dtsi (Doug)
- Fixed card detect name to match schematics (Doug).
- Moved comment about drive strength next to the drive-strength entry
(Doug)
- Removed drive-strength from card detect input pin (Doug).
- Consolidated tlmm nodes in MTP.
arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 58 ++++++++++++++++++++++++-
1 file changed, 56 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
index b3def03581775..cde76da42cbb7 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -7,6 +7,7 @@
/dts-v1/;
+#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
#include "sdm845.dtsi"
@@ -358,8 +359,16 @@
status = "okay";
};
-&tlmm {
- gpio-reserved-ranges = <0 4>, <81 4>;
+&sdhc_2 {
+ status = "okay";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdc2_clk &sdc2_cmd &sdc2_data &sd_card_det_n>;
+
+ vmmc-supply = <&vreg_l21a_2p95>;
+ vqmmc-supply = <&vddpx_2>;
+
+ cd-gpios = <&tlmm 126 GPIO_ACTIVE_LOW>;
};
&uart9 {
@@ -450,3 +459,48 @@
bias-pull-up;
};
};
+
+&tlmm {
+ gpio-reserved-ranges = <0 4>, <81 4>;
+
+ sdc2_clk: sdc2-clk {
+ pinconf {
+ pins = "sdc2_clk";
+ bias-disable;
+
+ /*
+ * It seems that mmc_test reports errors if drive
+ * strength is not 16 on clk, cmd, and data pins.
+ */
+ drive-strength = <16>;
+ };
+ };
+
+ sdc2_cmd: sdc2-cmd {
+ pinconf {
+ pins = "sdc2_cmd";
+ bias-pull-up;
+ drive-strength = <16>;
+ };
+ };
+
+ sdc2_data: sdc2-data {
+ pinconf {
+ pins = "sdc2_data";
+ bias-pull-up;
+ drive-strength = <16>;
+ };
+ };
+
+ sd_card_det_n: sd-card-det-n {
+ pinmux {
+ pins = "gpio126";
+ function = "gpio";
+ };
+
+ pinconf {
+ pins = "gpio126";
+ bias-pull-up;
+ };
+ };
+};
--
2.18.1
next prev parent reply other threads:[~2018-12-06 18:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-06 18:45 [PATCH v2 0/3] arm64: dts: qcom: sdm845: Add SD nodes Evan Green
2018-12-06 18:45 ` [PATCH v2 1/3] dt-bindings: mmc: sdhci-msm: Clarify register requirements Evan Green
2018-12-06 23:34 ` Doug Anderson
2018-12-06 23:39 ` Evan Green
2018-12-06 18:45 ` [PATCH v2 2/3] arm64: dts: qcom: sdm845: Add SD node Evan Green
2018-12-06 23:56 ` Bjorn Andersson
2018-12-06 18:45 ` Evan Green [this message]
2018-12-06 23:44 ` [PATCH v2 3/3] arm64: dts: qcom: sdm845: Add SD nodes for sdm845-mtp Doug Anderson
2018-12-06 23:57 ` 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=20181206184522.118062-4-evgreen@chromium.org \
--to=evgreen@chromium.org \
--cc=andy.gross@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=david.brown@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
/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).