leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: dts: AM33XX: Fix uart numbering to match hardware/TRM

Browse Source 
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: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Benoit Cousson <benoit.cousson@linaro.org>
This commit is contained in:
Vaibhav Hiremath 2013-03-28 11:36:05 +05:30 committed by Benoit Cousson
parent b8f70c3a80
commit dde3b0d64c
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/am335x-bone.dts
View File

@ -46,7 +46,7 @@
}; };
ocp { ocp {
uart1: serial@44e09000 { uart0: serial@44e09000 {
status = "okay"; status = "okay";
}; };

2
arch/arm/boot/dts/am335x-evm.dts
View File

@ -61,7 +61,7 @@
}; };
ocp { ocp {
uart1: serial@44e09000 { uart0: serial@44e09000 {
status = "okay"; status = "okay";
}; };

2
arch/arm/boot/dts/am335x-evmsk.dts
View File

@ -61,7 +61,7 @@
}; };
ocp { ocp {
uart1: serial@44e09000 { uart0: serial@44e09000 {
status = "okay"; status = "okay";
}; };

24
arch/arm/boot/dts/am33xx.dtsi
View File

@ -15,12 +15,12 @@
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
aliases { aliases {
serial0 = &uart1; serial0 = &uart0;
serial1 = &uart2; serial1 = &uart1;
serial2 = &uart3; serial2 = &uart2;
serial3 = &uart4; serial3 = &uart3;
serial4 = &uart5; serial4 = &uart4;
serial5 = &uart6; serial5 = &uart5;
d_can0 = &dcan0; d_can0 = &dcan0;
d_can1 = &dcan1; d_can1 = &dcan1;
}; };
@ -133,7 +133,7 @@
interrupts = <62>; interrupts = <62>;
}; };
uart1: serial@44e09000 { uart0: serial@44e09000 {
compatible = "ti,omap3-uart"; compatible = "ti,omap3-uart";
ti,hwmods = "uart1"; ti,hwmods = "uart1";
clock-frequency = <48000000>; clock-frequency = <48000000>;
@ -142,7 +142,7 @@
status = "disabled"; status = "disabled";
}; };
uart2: serial@48022000 { uart1: serial@48022000 {
compatible = "ti,omap3-uart"; compatible = "ti,omap3-uart";
ti,hwmods = "uart2"; ti,hwmods = "uart2";
clock-frequency = <48000000>; clock-frequency = <48000000>;
@ -151,7 +151,7 @@
status = "disabled"; status = "disabled";
}; };
uart3: serial@48024000 { uart2: serial@48024000 {
compatible = "ti,omap3-uart"; compatible = "ti,omap3-uart";
ti,hwmods = "uart3"; ti,hwmods = "uart3";
clock-frequency = <48000000>; clock-frequency = <48000000>;
@ -160,7 +160,7 @@
status = "disabled"; status = "disabled";
}; };
uart4: serial@481a6000 { uart3: serial@481a6000 {
compatible = "ti,omap3-uart"; compatible = "ti,omap3-uart";
ti,hwmods = "uart4"; ti,hwmods = "uart4";
clock-frequency = <48000000>; clock-frequency = <48000000>;
@ -169,7 +169,7 @@
status = "disabled"; status = "disabled";
}; };
uart5: serial@481a8000 { uart4: serial@481a8000 {
compatible = "ti,omap3-uart"; compatible = "ti,omap3-uart";
ti,hwmods = "uart5"; ti,hwmods = "uart5";
clock-frequency = <48000000>; clock-frequency = <48000000>;
@ -178,7 +178,7 @@
status = "disabled"; status = "disabled";
}; };
uart6: serial@481aa000 { uart5: serial@481aa000 {
compatible = "ti,omap3-uart"; compatible = "ti,omap3-uart";
ti,hwmods = "uart6"; ti,hwmods = "uart6";
clock-frequency = <48000000>; clock-frequency = <48000000>;