From: Vaibhav Hiremath <hvaibhav@ti.com>
To: linux-omap@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
devicetree-discuss@lists.ozlabs.org, mporter@ti.com,
b-cousson@ti.com, jacmet@sunsite.dk,
Vaibhav Hiremath <hvaibhav@ti.com>
Subject: [PATCH-V2 5/6] ARM: dts: AM33XX: Fix uart numbering to match hardware/TRM
Date: Thu, 28 Mar 2013 12:12:42 +0530 [thread overview]
Message-ID: <1364452963-22083-6-git-send-email-hvaibhav@ti.com> (raw)
In-Reply-To: <1364452963-22083-1-git-send-email-hvaibhav@ti.com>
With DT support, where naming convention is based on base-addr
and not id, so we should follow TRM/Spec numbering label.
This patch changes UART numbering as per TRM, as uart0-5.
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Acked-by: Matt Porter <mporter@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Peter Korsgaard <jacmet@sunsite.dk>
---
arch/arm/boot/dts/am335x-bone.dts | 2 +-
arch/arm/boot/dts/am335x-evm.dts | 2 +-
arch/arm/boot/dts/am335x-evmsk.dts | 2 +-
arch/arm/boot/dts/am33xx.dtsi | 24 ++++++++++++------------
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index 1d623e4..be2c501 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -46,7 +46,7 @@
};
ocp {
- uart1: serial@44e09000 {
+ uart0: serial@44e09000 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 79b3cc8..2f3f5be 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -61,7 +61,7 @@
};
ocp {
- uart1: serial@44e09000 {
+ uart0: serial@44e09000 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index 21d5a08..bcd7028 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -61,7 +61,7 @@
};
ocp {
- uart1: serial@44e09000 {
+ uart0: serial@44e09000 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index dd237de..565e05e 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -15,12 +15,12 @@
interrupt-parent = <&intc>;
aliases {
- serial0 = &uart1;
- serial1 = &uart2;
- serial2 = &uart3;
- serial3 = &uart4;
- serial4 = &uart5;
- serial5 = &uart6;
+ serial0 = &uart0;
+ serial1 = &uart1;
+ serial2 = &uart2;
+ serial3 = &uart3;
+ serial4 = &uart4;
+ serial5 = &uart5;
};
cpus {
@@ -131,7 +131,7 @@
interrupts = <62>;
};
- uart1: serial@44e09000 {
+ uart0: serial@44e09000 {
compatible = "ti,omap3-uart";
ti,hwmods = "uart1";
clock-frequency = <48000000>;
@@ -140,7 +140,7 @@
status = "disabled";
};
- uart2: serial@48022000 {
+ uart1: serial@48022000 {
compatible = "ti,omap3-uart";
ti,hwmods = "uart2";
clock-frequency = <48000000>;
@@ -149,7 +149,7 @@
status = "disabled";
};
- uart3: serial@48024000 {
+ uart2: serial@48024000 {
compatible = "ti,omap3-uart";
ti,hwmods = "uart3";
clock-frequency = <48000000>;
@@ -158,7 +158,7 @@
status = "disabled";
};
- uart4: serial@481a6000 {
+ uart3: serial@481a6000 {
compatible = "ti,omap3-uart";
ti,hwmods = "uart4";
clock-frequency = <48000000>;
@@ -167,7 +167,7 @@
status = "disabled";
};
- uart5: serial@481a8000 {
+ uart4: serial@481a8000 {
compatible = "ti,omap3-uart";
ti,hwmods = "uart5";
clock-frequency = <48000000>;
@@ -176,7 +176,7 @@
status = "disabled";
};
- uart6: serial@481aa000 {
+ uart5: serial@481aa000 {
compatible = "ti,omap3-uart";
ti,hwmods = "uart6";
clock-frequency = <48000000>;
--
1.7.0.4
next prev parent reply other threads:[~2013-03-28 6:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-28 6:42 [PATCH-V2 0/6] ARM: dts: AM33XX: Cleanup and pinctrl binding support Vaibhav Hiremath
[not found] ` <1364452963-22083-1-git-send-email-hvaibhav-l0cyMroinI0@public.gmane.org>
2013-03-28 6:42 ` [PATCH-V2 1/6] ARM: dts: AM33XX: Fix the i2c numbering to match hardware/TRM Vaibhav Hiremath
2013-03-28 6:42 ` [PATCH-V2 6/6] ARM: dts: AM33XX: Add default pinctrl binding for UART0 device Vaibhav Hiremath
2013-03-28 12:26 ` [PATCH-V2 0/6] ARM: dts: AM33XX: Cleanup and pinctrl binding support Benoit Cousson
2013-03-29 14:52 ` Hiremath, Vaibhav
2013-03-28 6:42 ` [PATCH-V2 2/6] ARM: dts: AM33XX: Add default pinctrl binding for I2C device Vaibhav Hiremath
2013-03-28 6:42 ` [PATCH-V2 3/6] ARM: dts: AM33XX: Fix gpio numbering to match hardware/TRM Vaibhav Hiremath
2013-03-28 6:42 ` [PATCH-V2 4/6] ARM: dts: AM33XX: Add pinctrl binding to gpio-leds node Vaibhav Hiremath
2013-03-28 6:42 ` Vaibhav Hiremath [this message]
2013-03-28 7:07 ` [PATCH-V2 5/6] ARM: dts: AM33XX: Fix uart numbering to match hardware/TRM Peter Korsgaard
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=1364452963-22083-6-git-send-email-hvaibhav@ti.com \
--to=hvaibhav@ti.com \
--cc=b-cousson@ti.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=jacmet@sunsite.dk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=mporter@ti.com \
/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).