On 11/16/2011 05:02 AM, Rajendra Nayak wrote:
Pass minimal data needed for console boot, from dt, for OMAP4 panda/sdp and OMAP3 beagle boards, and get rid of the static initialization from generic board file.
Signed-off-by: Rajendra Nayak rnayak@ti.com
arch/arm/boot/dts/omap3-beagle.dts | 17 +++++++++++++++++ arch/arm/boot/dts/omap3.dtsi | 27 +++++++++++++++++++++++++++ arch/arm/boot/dts/omap4-panda.dts | 17 +++++++++++++++++ arch/arm/boot/dts/omap4-sdp.dts | 17 +++++++++++++++++ arch/arm/boot/dts/omap4.dtsi | 24 ++++++++++++++++++++++++ arch/arm/mach-omap2/board-generic.c | 1 - 6 files changed, 102 insertions(+), 1 deletions(-)
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts index 9486be6..4c8f11e 100644 --- a/arch/arm/boot/dts/omap3-beagle.dts +++ b/arch/arm/boot/dts/omap3-beagle.dts @@ -27,3 +27,20 @@ reg = <0x80000000 0x20000000>; /* 512 MB */ }; };
+&uart1 {
- clock-frequency = <48000000>;
+};
+&uart2 {
- clock-frequency = <48000000>;
+};
+&uart3 {
- ti,console_hwmod;
- clock-frequency = <48000000>;
+};
+&uart4 {
- clock-frequency = <48000000>;
+}; diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index d202bb5..ea591c5 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -13,6 +13,13 @@ / { compatible = "ti,omap3430", "ti,omap3";
- aliases {
uart1 = &uart1;uart2 = &uart2;uart3 = &uart3;uart4 = &uart4;- };
- cpus { cpu@0 { compatible = "arm,cortex-a8";
@@ -59,5 +66,25 @@ interrupt-controller; #interrupt-cells = <1>; };
uart1: uart@1 {
Use the generic name serial and the address: uart1: serial@1234abcd
compatible = "ti,omap-uart";ti,hwmods = "uart1";};uart2: uart@2 {compatible = "ti,omap-uart";ti,hwmods = "uart2";};uart3: uart@3 {compatible = "ti,omap-uart";ti,hwmods = "uart3";};uart4: uart@4 {compatible = "ti,omap-uart";ti,hwmods = "uart4";};}; diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts index c702657..aa65449 100644 --- a/arch/arm/boot/dts/omap4-panda.dts +++ b/arch/arm/boot/dts/omap4-panda.dts @@ -27,3 +27,20 @@ reg = <0x80000000 0x40000000>; /* 1 GB */ }; };
+&uart1 {
- clock-frequency = <48000000>;
+};
+&uart2 {
- clock-frequency = <48000000>;
+};
+&uart3 {
- ti,console_hwmod;
- clock-frequency = <48000000>;
+};
+&uart4 {
- clock-frequency = <48000000>;
+}; diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts index 066e28c..524f5bf 100644 --- a/arch/arm/boot/dts/omap4-sdp.dts +++ b/arch/arm/boot/dts/omap4-sdp.dts @@ -27,3 +27,20 @@ reg = <0x80000000 0x40000000>; /* 1 GB */ }; };
+&uart1 {
- clock-frequency = <48000000>;
+};
+&uart2 {
- clock-frequency = <48000000>;
+};
+&uart3 {
- ti,console_hwmod;
- clock-frequency = <48000000>;
+};
+&uart4 {
- clock-frequency = <48000000>;
It doesn't seem that this frequency ever varies and is likely to be replaced with clock bindings, so maybe just put it in the dtsi files.
Rob