From: Kumar Gala <galak@codeaurora.org>
To: Rob Herring <rob.herring@calxeda.com>,
Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Stephen Warren <swarren@wwwdotorg.org>,
Ian Campbell <ian.campbell@citrix.com>,
gregkh@linuxfoundation.org
Cc: Kumar Gala <galak@codeaurora.org>,
devicetree@vger.kernel.org, linux-serial@vger.kernel.org,
linux-kernel@vger.kernel.org, fabio.estevam@freescale.com,
s.hauer@pengutronix.de, shawn.guo@linaro.org
Subject: [PATCH 1/2] serial: fsl-imx-uart: Cleanup duplicate device tree binding
Date: Wed, 28 Aug 2013 14:08:22 -0500 [thread overview]
Message-ID: <1377716903-19699-1-git-send-email-galak@codeaurora.org> (raw)
We had two bindings for the same serial device, it looks like the one in
tty/serial/fsl-imx-uart.txt is the more up to date one so go with it and
merge a few things about the use/need for aliases in from
serial/fsl-imx-uart.txt.
Signed-off-by: Kumar Gala <galak@codeaurora.org>
---
.../devicetree/bindings/serial/fsl-imx-uart.txt | 35 ----------------------
.../bindings/tty/serial/fsl-imx-uart.txt | 9 +++++-
2 files changed, 8 insertions(+), 36 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/serial/fsl-imx-uart.txt
diff --git a/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt b/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt
deleted file mode 100644
index c58573b..0000000
--- a/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-* Freescale i.MX UART controller
-
-Required properties:
-- compatible : should be "fsl,imx21-uart"
-- reg : Address and length of the register set for the device
-- interrupts : Should contain UART interrupt number
-
-Optional properties:
-- fsl,uart-has-rtscts: indicate that RTS/CTS signals are used
-
-Note: Each uart controller should have an alias correctly numbered
-in "aliases" node.
-
-Example:
-
-- From imx51.dtsi:
-aliases {
- serial0 = &uart1;
- serial1 = &uart2;
- serial2 = &uart3;
-};
-
-uart1: serial@73fbc000 {
- compatible = "fsl,imx51-uart", "fsl,imx21-uart";
- reg = <0x73fbc000 0x4000>;
- interrupts = <31>;
- status = "disabled";
-}
-
-- From imx51-babbage.dts:
-uart1: serial@73fbc000 {
- fsl,uart-has-rtscts;
- status = "okay";
-};
-
diff --git a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt
index c662eb3..35ae1fb 100644
--- a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt
+++ b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt
@@ -11,9 +11,16 @@ Optional properties:
- fsl,dte-mode : Indicate the uart works in DTE mode. The uart works
is DCE mode by default.
+Note: Each uart controller should have an alias correctly numbered
+in "aliases" node.
+
Example:
-serial@73fbc000 {
+aliases {
+ serial0 = &uart1;
+};
+
+uart1: serial@73fbc000 {
compatible = "fsl,imx51-uart", "fsl,imx21-uart";
reg = <0x73fbc000 0x4000>;
interrupts = <31>;
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
next reply other threads:[~2013-08-28 19:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-28 19:08 Kumar Gala [this message]
2013-08-28 19:08 ` [PATCH 2/2] serial: unify serial bindings into a single dir Kumar Gala
2013-08-29 12:55 ` [PATCH 1/2] serial: fsl-imx-uart: Cleanup duplicate device tree binding Shawn Guo
2013-09-02 11:40 ` Mark Rutland
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=1377716903-19699-1-git-send-email-galak@codeaurora.org \
--to=galak@codeaurora.org \
--cc=devicetree@vger.kernel.org \
--cc=fabio.estevam@freescale.com \
--cc=gregkh@linuxfoundation.org \
--cc=ian.campbell@citrix.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=rob.herring@calxeda.com \
--cc=s.hauer@pengutronix.de \
--cc=shawn.guo@linaro.org \
--cc=swarren@wwwdotorg.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).