From: Soren Brinkmann <soren.brinkmann@xilinx.com>
To: Michal Simek <michal.simek@xilinx.com>,
Russell King <linux@arm.linux.org.uk>,
Steffen Trumtrar <s.trumtrar@pengutronix.de>
Cc: Dinh Nguyen <dinguyen@altera.com>,
Shawn Guo <shawn.guo@linaro.org>, Olof Johansson <olof@lixom.net>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Soren Brinkmann <soren.brinkmann@xilinx.com>
Subject: [PATCH v3 2/4] arm: dt: zynq: Use 'status' property for UART nodes
Date: Thu, 13 Jun 2013 09:37:16 -0700 [thread overview]
Message-ID: <1371141438-16553-3-git-send-email-soren.brinkmann@xilinx.com> (raw)
In-Reply-To: <1371141438-16553-1-git-send-email-soren.brinkmann@xilinx.com>
Set the default status for UARTs to disabled in the zynq-7000.dtsi file
and let board dts files enable the UARTs on demand.
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
arch/arm/boot/dts/zynq-7000.dtsi | 2 ++
arch/arm/boot/dts/zynq-zc702.dts | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index 0dbee2c..6f54a64 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -49,6 +49,7 @@
uart0: uart@e0000000 {
compatible = "xlnx,xuartps";
+ status = "disabled";
clocks = <&clkc 23>, <&clkc 40>;
clock-names = "ref_clk", "aper_clk";
reg = <0xE0000000 0x1000>;
@@ -57,6 +58,7 @@
uart1: uart@e0001000 {
compatible = "xlnx,xuartps";
+ status = "disabled";
clocks = <&clkc 24>, <&clkc 41>;
clock-names = "ref_clk", "aper_clk";
reg = <0xE0001000 0x1000>;
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index e25a307..21aea99 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -24,7 +24,11 @@
};
chosen {
- bootargs = "console=ttyPS1,115200 earlyprintk";
+ bootargs = "console=ttyPS0,115200 earlyprintk";
};
};
+
+&uart1 {
+ status = "okay";
+};
--
1.8.3
next prev parent reply other threads:[~2013-06-13 16:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-13 16:37 [PATCH v3 0/4] Zynq: Support more boards Soren Brinkmann
2013-06-13 16:37 ` [PATCH v3 1/4] arm: zynq: Remove board specific compatibility string Soren Brinkmann
2013-06-13 16:37 ` Soren Brinkmann [this message]
2013-06-13 16:37 ` [PATCH v3 3/4] arm: dt: zynq: Add support for the zc706 platform Soren Brinkmann
2013-06-13 16:37 ` [PATCH v3 4/4] arm: dt: zynq: Add support for the zed platform Soren Brinkmann
2013-06-17 8:02 ` [PATCH v3 0/4] Zynq: Support more boards Steffen Trumtrar
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=1371141438-16553-3-git-send-email-soren.brinkmann@xilinx.com \
--to=soren.brinkmann@xilinx.com \
--cc=dinguyen@altera.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=michal.simek@xilinx.com \
--cc=olof@lixom.net \
--cc=s.trumtrar@pengutronix.de \
--cc=shawn.guo@linaro.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
all inboxes | Powered by JetHome®