diff options
author | Rajendra Nayak <rnayak@ti.com> | 2011-12-14 06:55:46 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-12-16 17:15:17 -0500 |
commit | cf3c79de2b90711a32ce767f7fab2da05966db3c (patch) | |
tree | 51c16913c15b52f06f0f4b5b721226e8885e3663 /arch/arm | |
parent | f20b933d2a51ffce8af1c8b77b925ce07245a575 (diff) |
ARM: omap: pass minimal SoC/board data for UART from dt
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>
Reviewed-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/omap3.dtsi | 31 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap4.dtsi | 28 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 1 |
3 files changed, 59 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index d202bb5ec7ef..216c3317461d 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi | |||
@@ -13,6 +13,13 @@ | |||
13 | / { | 13 | / { |
14 | compatible = "ti,omap3430", "ti,omap3"; | 14 | compatible = "ti,omap3430", "ti,omap3"; |
15 | 15 | ||
16 | aliases { | ||
17 | serial0 = &uart1; | ||
18 | serial1 = &uart2; | ||
19 | serial2 = &uart3; | ||
20 | serial3 = &uart4; | ||
21 | }; | ||
22 | |||
16 | cpus { | 23 | cpus { |
17 | cpu@0 { | 24 | cpu@0 { |
18 | compatible = "arm,cortex-a8"; | 25 | compatible = "arm,cortex-a8"; |
@@ -59,5 +66,29 @@ | |||
59 | interrupt-controller; | 66 | interrupt-controller; |
60 | #interrupt-cells = <1>; | 67 | #interrupt-cells = <1>; |
61 | }; | 68 | }; |
69 | |||
70 | uart1: serial@0x4806a000 { | ||
71 | compatible = "ti,omap3-uart"; | ||
72 | ti,hwmods = "uart1"; | ||
73 | clock-frequency = <48000000>; | ||
74 | }; | ||
75 | |||
76 | uart2: serial@0x4806c000 { | ||
77 | compatible = "ti,omap3-uart"; | ||
78 | ti,hwmods = "uart2"; | ||
79 | clock-frequency = <48000000>; | ||
80 | }; | ||
81 | |||
82 | uart3: serial@0x49020000 { | ||
83 | compatible = "ti,omap3-uart"; | ||
84 | ti,hwmods = "uart3"; | ||
85 | clock-frequency = <48000000>; | ||
86 | }; | ||
87 | |||
88 | uart4: serial@0x49042000 { | ||
89 | compatible = "ti,omap3-uart"; | ||
90 | ti,hwmods = "uart4"; | ||
91 | clock-frequency = <48000000>; | ||
92 | }; | ||
62 | }; | 93 | }; |
63 | }; | 94 | }; |
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 4c61c829043a..e8fe75fac7c5 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi | |||
@@ -21,6 +21,10 @@ | |||
21 | interrupt-parent = <&gic>; | 21 | interrupt-parent = <&gic>; |
22 | 22 | ||
23 | aliases { | 23 | aliases { |
24 | serial0 = &uart1; | ||
25 | serial1 = &uart2; | ||
26 | serial2 = &uart3; | ||
27 | serial3 = &uart4; | ||
24 | }; | 28 | }; |
25 | 29 | ||
26 | cpus { | 30 | cpus { |
@@ -99,5 +103,29 @@ | |||
99 | reg = <0x48241000 0x1000>, | 103 | reg = <0x48241000 0x1000>, |
100 | <0x48240100 0x0100>; | 104 | <0x48240100 0x0100>; |
101 | }; | 105 | }; |
106 | |||
107 | uart1: serial@0x4806a000 { | ||
108 | compatible = "ti,omap4-uart"; | ||
109 | ti,hwmods = "uart1"; | ||
110 | clock-frequency = <48000000>; | ||
111 | }; | ||
112 | |||
113 | uart2: serial@0x4806c000 { | ||
114 | compatible = "ti,omap4-uart"; | ||
115 | ti,hwmods = "uart2"; | ||
116 | clock-frequency = <48000000>; | ||
117 | }; | ||
118 | |||
119 | uart3: serial@0x48020000 { | ||
120 | compatible = "ti,omap4-uart"; | ||
121 | ti,hwmods = "uart3"; | ||
122 | clock-frequency = <48000000>; | ||
123 | }; | ||
124 | |||
125 | uart4: serial@0x4806e000 { | ||
126 | compatible = "ti,omap4-uart"; | ||
127 | ti,hwmods = "uart4"; | ||
128 | clock-frequency = <48000000>; | ||
129 | }; | ||
102 | }; | 130 | }; |
103 | }; | 131 | }; |
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 63b54163b993..a508ed5cc890 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
@@ -69,7 +69,6 @@ static void __init omap_generic_init(void) | |||
69 | if (node) | 69 | if (node) |
70 | irq_domain_add_simple(node, 0); | 70 | irq_domain_add_simple(node, 0); |
71 | 71 | ||
72 | omap_serial_init(); | ||
73 | omap_sdrc_init(NULL, NULL); | 72 | omap_sdrc_init(NULL, NULL); |
74 | 73 | ||
75 | of_platform_populate(NULL, omap_dt_match_table, NULL, NULL); | 74 | of_platform_populate(NULL, omap_dt_match_table, NULL, NULL); |