From: Rajendra Nayak <rnayak@codeaurora.org>
To: andy.gross@linaro.org
Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
Rajendra Nayak <rnayak@codeaurora.org>
Subject: [PATCH 2/2] arm64: dts: sdm845: Add serial console support
Date: Thu, 25 Jan 2018 22:02:16 +0530 [thread overview]
Message-ID: <20180125163216.29018-3-rnayak@codeaurora.org> (raw)
In-Reply-To: <20180125163216.29018-1-rnayak@codeaurora.org>
Add the qup uart node and geni se instance needed to
support the serial console on the MTP.
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
This patch is based on the current proposed DT bindings for
the geni based serial driver [1] and also depends on the GCC
driver [2] which adds dt-bindings/clock/qcom,gcc-sdm845.h header.
This can only be merged once the dependent patches do.
[1] https://patchwork.ozlabs.org/cover/860251/
[2] https://lkml.org/lkml/2018/1/22/78
arch/arm64/boot/dts/qcom/sdm845-mtp.dtsi | 3 +++
arch/arm64/boot/dts/qcom/sdm845-pins.dtsi | 32 +++++++++++++++++++++++++++++++
arch/arm64/boot/dts/qcom/sdm845.dtsi | 22 +++++++++++++++++++++
3 files changed, 57 insertions(+)
create mode 100644 arch/arm64/boot/dts/qcom/sdm845-pins.dtsi
diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dtsi b/arch/arm64/boot/dts/qcom/sdm845-mtp.dtsi
index 5b1022c20bad..640a48cd628b 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dtsi
@@ -7,5 +7,8 @@
/ {
soc {
+ serial@a84000 {
+ status = "okay";
+ };
};
};
diff --git a/arch/arm64/boot/dts/qcom/sdm845-pins.dtsi b/arch/arm64/boot/dts/qcom/sdm845-pins.dtsi
new file mode 100644
index 000000000000..b97f99e6f4b4
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sdm845-pins.dtsi
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ */
+
+&tlmm {
+ qup_uart2_default: qup_uart2_default {
+ pinmux {
+ function = "qup9";
+ pins = "gpio4", "gpio5";
+ };
+
+ pinconf {
+ pins = "gpio4", "gpio5";
+ drive-strength = <2>;
+ bias-disable;
+ };
+ };
+
+ qup_uart2_sleep: qup_uart2_sleep {
+ pinmux {
+ function = "gpio";
+ pins = "gpio4", "gpio5";
+ };
+
+ pinconf {
+ pins = "gpio4", "gpio5";
+ drive-strength = <2>;
+ bias-disable;
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index a21f4912b3e2..529f4ba3a1db 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -4,6 +4,7 @@
*/
#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/clock/qcom,gcc-sdm845.h>
/ {
model = "Qualcomm Technologies, Inc. SDM845";
@@ -304,5 +305,26 @@
cell-index = <0>;
};
+ qup_1: qcom,geni_se@ac0000 {
+ compatible = "qcom,geni-se-qup";
+ reg = <0xac0000 0x6000>;
+ };
+
+ qup_uart2: serial@a84000 {
+ compatible = "qcom,geni-console", "qcom,geni-uart";
+ reg = <0xa84000 0x4000>;
+ reg-names = "se_phys";
+ clock-names = "se-clk", "m-ahb", "s-ahb";
+ clocks = <&gcc GCC_QUPV3_WRAP1_S1_CLK>,
+ <&gcc GCC_QUPV3_WRAP_1_M_AHB_CLK>,
+ <&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>;
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&qup_uart2_default>;
+ pinctrl-1 = <&qup_uart2_sleep>;
+ interrupts = <GIC_SPI 354 IRQ_TYPE_NONE>;
+ qcom,wrapper-core = <&qup_1>;
+ status = "disabled";
+ };
};
};
+#include "sdm845-pins.dtsi"
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
next prev parent reply other threads:[~2018-01-25 16:32 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-25 16:32 [PATCH 0/2] Add DTS for SDM845 SoC and MTP Rajendra Nayak
[not found] ` <20180125163216.29018-1-rnayak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-01-25 16:32 ` [PATCH 1/2] arm64: dts: sdm845: Add minimal dts/dtsi files for sdm845 " Rajendra Nayak
[not found] ` <20180125163216.29018-2-rnayak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-01-26 20:31 ` Evan Green
2018-01-30 8:48 ` Rajendra Nayak
2018-01-26 22:15 ` Stephen Boyd
[not found] ` <20180126221501.GD28313-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-01-29 8:13 ` Rajendra Nayak
2018-01-30 9:48 ` Stephen Boyd
2018-01-30 10:25 ` Rajendra Nayak
2018-02-06 20:26 ` Rob Herring
[not found] ` <CAL_JsqJ1xjQ5ZP-KXeZQ0s=ib8GTfvfYjFqyy+Zcub-akCs7Bw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-02-07 4:14 ` Rajendra Nayak
2018-02-06 18:54 ` Bjorn Andersson
2018-02-07 4:15 ` Rajendra Nayak
2018-02-06 20:31 ` Rob Herring
2018-02-07 4:47 ` Rajendra Nayak
2018-02-07 17:37 ` Rob Herring
2018-01-25 16:32 ` Rajendra Nayak [this message]
2018-01-26 22:18 ` [PATCH 2/2] arm64: dts: sdm845: Add serial console support Stephen Boyd
2018-01-29 8:18 ` Rajendra Nayak
2018-02-06 19:00 ` Bjorn Andersson
2018-02-06 18:37 ` Doug Anderson
[not found] ` <CAD=FV=WcCnQJc25=sKWtOi=ZWi=ium6DVsexuQnsLDL=aJE6-Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-02-06 19:06 ` Bjorn Andersson
2018-02-06 19:49 ` Doug Anderson
[not found] ` <CAD=FV=Whxf1VRJ6qx9mioEEkTeS+uJfJKPbOMcGy-Wigh_NORw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-02-06 20:05 ` Bjorn Andersson
2018-02-07 4:12 ` Rajendra Nayak
[not found] ` <20180126221808.GE28313-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-02-06 20:36 ` Rob Herring
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=20180125163216.29018-3-rnayak@codeaurora.org \
--to=rnayak@codeaurora.org \
--cc=andy.gross@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.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).