1 From 533dc09b3515211d6bee1f63aa3ddd659d0d319c Mon Sep 17 00:00:00 2001
2 From: Vikram Pandita <vikram.pandita@ti.com>
3 Date: Thu, 20 Aug 2009 16:58:42 -0500
4 Subject: [PATCH 2/5] OMAP1/2/3/4: Adapt board files for cleand DEBUG_LL interface
6 This patch assigns the physical address of debug uart as defined
7 in menucoinfig item CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR to phys_io
9 The virtual address for io_pg_offset is calculated as per static
12 CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR is a hex value and for boards
13 like Zoom2, the phy address can be zero, in case debug board
16 Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
18 arch/arm/mach-omap2/board-2430sdp.c | 4 ++--
19 arch/arm/mach-omap2/board-3430sdp.c | 4 ++--
20 arch/arm/mach-omap2/board-4430sdp.c | 4 ++--
21 arch/arm/mach-omap2/board-apollon.c | 4 ++--
22 arch/arm/mach-omap2/board-generic.c | 4 ++--
23 arch/arm/mach-omap2/board-h4.c | 4 ++--
24 arch/arm/mach-omap2/board-ldp.c | 4 ++--
25 arch/arm/mach-omap2/board-n8x0.c | 12 ++++++------
26 arch/arm/mach-omap2/board-omap3beagle.c | 4 ++--
27 arch/arm/mach-omap2/board-omap3evm.c | 4 ++--
28 arch/arm/mach-omap2/board-omap3pandora.c | 4 ++--
29 arch/arm/mach-omap2/board-overo.c | 4 ++--
30 arch/arm/mach-omap2/board-rx51.c | 4 ++--
31 arch/arm/mach-omap2/board-zoom2.c | 4 ++--
32 14 files changed, 32 insertions(+), 32 deletions(-)
34 diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
35 index c693668..9ed2f2c 100644
36 --- a/arch/arm/mach-omap2/board-2430sdp.c
37 +++ b/arch/arm/mach-omap2/board-2430sdp.c
38 @@ -225,8 +225,8 @@ static void __init omap_2430sdp_map_io(void)
40 MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board")
41 /* Maintainer: Syed Khasim - Texas Instruments Inc */
42 - .phys_io = 0x48000000,
43 - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
44 + .phys_io = CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR,
45 + .io_pg_offst = ((CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR + OMAP2_IO_OFFSET) >> 18) & 0xfffc,
46 .boot_params = 0x80000100,
47 .map_io = omap_2430sdp_map_io,
48 .init_irq = omap_2430sdp_init_irq,
49 diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
50 index c71417f..f085eee 100644
51 --- a/arch/arm/mach-omap2/board-3430sdp.c
52 +++ b/arch/arm/mach-omap2/board-3430sdp.c
53 @@ -505,8 +505,8 @@ static void __init omap_3430sdp_map_io(void)
55 MACHINE_START(OMAP_3430SDP, "OMAP3430 3430SDP board")
56 /* Maintainer: Syed Khasim - Texas Instruments Inc */
57 - .phys_io = 0x48000000,
58 - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
59 + .phys_io = CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR,
60 + .io_pg_offst = ((CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR + OMAP2_IO_OFFSET) >> 18) & 0xfffc,
61 .boot_params = 0x80000100,
62 .map_io = omap_3430sdp_map_io,
63 .init_irq = omap_3430sdp_init_irq,
64 diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
65 index 646079f..4c1a166 100644
66 --- a/arch/arm/mach-omap2/board-4430sdp.c
67 +++ b/arch/arm/mach-omap2/board-4430sdp.c
68 @@ -83,8 +83,8 @@ static void __init omap_4430sdp_map_io(void)
70 MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board")
71 /* Maintainer: Santosh Shilimkar - Texas Instruments Inc */
72 - .phys_io = 0x48000000,
73 - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
74 + .phys_io = CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR,
75 + .io_pg_offst = ((CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR + OMAP2_IO_OFFSET) >> 18) & 0xfffc,
76 .boot_params = 0x80000100,
77 .map_io = omap_4430sdp_map_io,
78 .init_irq = omap_4430sdp_init_irq,
79 diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
80 index e2947fd..61da659 100644
81 --- a/arch/arm/mach-omap2/board-apollon.c
82 +++ b/arch/arm/mach-omap2/board-apollon.c
83 @@ -336,8 +336,8 @@ static void __init omap_apollon_map_io(void)
85 MACHINE_START(OMAP_APOLLON, "OMAP24xx Apollon")
86 /* Maintainer: Kyungmin Park <kyungmin.park@samsung.com> */
87 - .phys_io = 0x48000000,
88 - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
89 + .phys_io = CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR,
90 + .io_pg_offst = ((CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR + OMAP2_IO_OFFSET) >> 18) & 0xfffc,
91 .boot_params = 0x80000100,
92 .map_io = omap_apollon_map_io,
93 .init_irq = omap_apollon_init_irq,
94 diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
95 index fc9eccb..6d39eaa 100644
96 --- a/arch/arm/mach-omap2/board-generic.c
97 +++ b/arch/arm/mach-omap2/board-generic.c
98 @@ -59,8 +59,8 @@ static void __init omap_generic_map_io(void)
100 MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx")
101 /* Maintainer: Paul Mundt <paul.mundt@nokia.com> */
102 - .phys_io = 0x48000000,
103 - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
104 + .phys_io = CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR,
105 + .io_pg_offst = ((CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR - OMAP1_IO_OFFSET) >> 18) & 0xfffc,
106 .boot_params = 0x80000100,
107 .map_io = omap_generic_map_io,
108 .init_irq = omap_generic_init_irq,
109 diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
110 index 7eda321..4ce760f 100644
111 --- a/arch/arm/mach-omap2/board-h4.c
112 +++ b/arch/arm/mach-omap2/board-h4.c
113 @@ -379,8 +379,8 @@ static void __init omap_h4_map_io(void)
115 MACHINE_START(OMAP_H4, "OMAP2420 H4 board")
116 /* Maintainer: Paul Mundt <paul.mundt@nokia.com> */
117 - .phys_io = 0x48000000,
118 - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
119 + .phys_io = CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR,
120 + .io_pg_offst = ((CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR + OMAP2_IO_OFFSET) >> 18) & 0xfffc,
121 .boot_params = 0x80000100,
122 .map_io = omap_h4_map_io,
123 .init_irq = omap_h4_init_irq,
124 diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
125 index 4a4b300..5f06434 100644
126 --- a/arch/arm/mach-omap2/board-ldp.c
127 +++ b/arch/arm/mach-omap2/board-ldp.c
128 @@ -398,8 +398,8 @@ static void __init omap_ldp_map_io(void)
131 MACHINE_START(OMAP_LDP, "OMAP LDP board")
132 - .phys_io = 0x48000000,
133 - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
134 + .phys_io = CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR,
135 + .io_pg_offst = ((CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR + OMAP2_IO_OFFSET) >> 18) & 0xfffc,
136 .boot_params = 0x80000100,
137 .map_io = omap_ldp_map_io,
138 .init_irq = omap_ldp_init_irq,
139 diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
140 index af6fcee..464b432 100644
141 --- a/arch/arm/mach-omap2/board-n8x0.c
142 +++ b/arch/arm/mach-omap2/board-n8x0.c
143 @@ -125,8 +125,8 @@ static void __init n8x0_init_machine(void)
146 MACHINE_START(NOKIA_N800, "Nokia N800")
147 - .phys_io = 0x48000000,
148 - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
149 + .phys_io = CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR,
150 + .io_pg_offst = ((CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR + OMAP2_IO_OFFSET) >> 18) & 0xfffc,
151 .boot_params = 0x80000100,
152 .map_io = n8x0_map_io,
153 .init_irq = n8x0_init_irq,
154 @@ -135,8 +135,8 @@ MACHINE_START(NOKIA_N800, "Nokia N800")
157 MACHINE_START(NOKIA_N810, "Nokia N810")
158 - .phys_io = 0x48000000,
159 - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
160 + .phys_io = CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR,
161 + .io_pg_offst = ((CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR + OMAP2_IO_OFFSET) >> 18) & 0xfffc,
162 .boot_params = 0x80000100,
163 .map_io = n8x0_map_io,
164 .init_irq = n8x0_init_irq,
165 @@ -145,8 +145,8 @@ MACHINE_START(NOKIA_N810, "Nokia N810")
168 MACHINE_START(NOKIA_N810_WIMAX, "Nokia N810 WiMAX")
169 - .phys_io = 0x48000000,
170 - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
171 + .phys_io = CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR,
172 + .io_pg_offst = ((CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR + OMAP2_IO_OFFSET) >> 18) & 0xfffc,
173 .boot_params = 0x80000100,
174 .map_io = n8x0_map_io,
175 .init_irq = n8x0_init_irq,
176 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
177 index 07aee90..4d30948 100644
178 --- a/arch/arm/mach-omap2/board-omap3beagle.c
179 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
180 @@ -428,8 +428,8 @@ static void __init omap3_beagle_map_io(void)
182 MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board")
183 /* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */
184 - .phys_io = 0x48000000,
185 - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
186 + .phys_io = CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR,
187 + .io_pg_offst = ((CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR + OMAP2_IO_OFFSET) >> 18) & 0xfffc,
188 .boot_params = 0x80000100,
189 .map_io = omap3_beagle_map_io,
190 .init_irq = omap3_beagle_init_irq,
191 diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
192 index c0cb29d..8f24dd6 100644
193 --- a/arch/arm/mach-omap2/board-omap3evm.c
194 +++ b/arch/arm/mach-omap2/board-omap3evm.c
195 @@ -324,8 +324,8 @@ static void __init omap3_evm_map_io(void)
197 MACHINE_START(OMAP3EVM, "OMAP3 EVM")
198 /* Maintainer: Syed Mohammed Khasim - Texas Instruments */
199 - .phys_io = 0x48000000,
200 - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
201 + .phys_io = CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR,
202 + .io_pg_offst = ((CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR + OMAP2_IO_OFFSET) >> 18) & 0xfffc,
203 .boot_params = 0x80000100,
204 .map_io = omap3_evm_map_io,
205 .init_irq = omap3_evm_init_irq,
206 diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
207 index 1991f19..05d1994 100644
208 --- a/arch/arm/mach-omap2/board-omap3pandora.c
209 +++ b/arch/arm/mach-omap2/board-omap3pandora.c
210 @@ -412,8 +412,8 @@ static void __init omap3pandora_map_io(void)
213 MACHINE_START(OMAP3_PANDORA, "Pandora Handheld Console")
214 - .phys_io = 0x48000000,
215 - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
216 + .phys_io = CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR,
217 + .io_pg_offst = ((CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR + OMAP2_IO_OFFSET) >> 18) & 0xfffc,
218 .boot_params = 0x80000100,
219 .map_io = omap3pandora_map_io,
220 .init_irq = omap3pandora_init_irq,
221 diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
222 index a9d7c2e..4057a1b 100644
223 --- a/arch/arm/mach-omap2/board-overo.c
224 +++ b/arch/arm/mach-omap2/board-overo.c
225 @@ -454,8 +454,8 @@ static void __init overo_map_io(void)
228 MACHINE_START(OVERO, "Gumstix Overo")
229 - .phys_io = 0x48000000,
230 - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
231 + .phys_io = CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR,
232 + .io_pg_offst = ((CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR + OMAP2_IO_OFFSET) >> 18) & 0xfffc,
233 .boot_params = 0x80000100,
234 .map_io = overo_map_io,
235 .init_irq = overo_init_irq,
236 diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c
237 index 8a3dc61..4b97fe8 100644
238 --- a/arch/arm/mach-omap2/board-rx51.c
239 +++ b/arch/arm/mach-omap2/board-rx51.c
240 @@ -88,8 +88,8 @@ static void __init rx51_map_io(void)
242 MACHINE_START(NOKIA_RX51, "Nokia RX-51 board")
243 /* Maintainer: Lauri Leukkunen <lauri.leukkunen@nokia.com> */
244 - .phys_io = 0x48000000,
245 - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
246 + .phys_io = CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR,
247 + .io_pg_offst = ((CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR + OMAP2_IO_OFFSET) >> 18) & 0xfffc,
248 .boot_params = 0x80000100,
249 .map_io = rx51_map_io,
250 .init_irq = rx51_init_irq,
251 diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c
252 index 4d295d5..58baee3 100644
253 --- a/arch/arm/mach-omap2/board-zoom2.c
254 +++ b/arch/arm/mach-omap2/board-zoom2.c
255 @@ -280,8 +280,8 @@ static void __init omap_zoom2_map_io(void)
258 MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
259 - .phys_io = 0x48000000,
260 - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
261 + .phys_io = CONFIG_OMAP_DEBUG_LL_UART_PHY_ADDR,
262 + .io_pg_offst = ((ZOOM2_EXT_QUART_VIRT) >> 18) & 0xfffc,
263 .boot_params = 0x80000100,
264 .map_io = omap_zoom2_map_io,
265 .init_irq = omap_zoom2_init_irq,
