aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGovindraj.R <govindraj.raja@ti.com>2010-09-27 10:49:46 -0400
committerKevin Hilman <khilman@deeprootsystems.com>2010-09-29 15:42:57 -0400
commitc04ede382a64020f19e9aa23a85493a09af945d3 (patch)
treee4cc6e0d3d37589f8c7247f87c6fc928128bd064
parent6f251e9db1093c187addc309b5f2f7fe3efd2995 (diff)
OMAP2: UART: remove set_uart_globals
Remove set_uart_globals function as this will not be needed as physical address for uarts will be taken from hwmod data file. Signed-off-by: Govindraj.R <govindraj.raja@ti.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
-rw-r--r--arch/arm/mach-omap2/serial.c5
-rw-r--r--arch/arm/plat-omap/common.c16
-rw-r--r--arch/arm/plat-omap/include/plat/common.h1
3 files changed, 0 insertions, 22 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index e6c40273dafe..6ffbc924c4d4 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -104,11 +104,6 @@ struct omap_uart_state {
104static LIST_HEAD(uart_list); 104static LIST_HEAD(uart_list);
105static u8 num_uarts; 105static u8 num_uarts;
106 106
107
108void __init omap2_set_globals_uart(struct omap_globals *omap2_globals)
109{
110}
111
112static struct omap_device_pm_latency omap_uart_latency[] = { 107static struct omap_device_pm_latency omap_uart_latency[] = {
113 { 108 {
114 .deactivate_func = omap_device_idle_hwmods, 109 .deactivate_func = omap_device_idle_hwmods,
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 7d668b3b5363..947de3fb93f3 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -257,7 +257,6 @@ static void __init __omap2_set_globals(struct omap_globals *omap2_globals)
257 omap2_set_globals_sdrc(omap2_globals); 257 omap2_set_globals_sdrc(omap2_globals);
258 omap2_set_globals_control(omap2_globals); 258 omap2_set_globals_control(omap2_globals);
259 omap2_set_globals_prcm(omap2_globals); 259 omap2_set_globals_prcm(omap2_globals);
260 omap2_set_globals_uart(omap2_globals);
261} 260}
262 261
263#endif 262#endif
@@ -272,9 +271,6 @@ static struct omap_globals omap242x_globals = {
272 .ctrl = OMAP2420_CTRL_BASE, 271 .ctrl = OMAP2420_CTRL_BASE,
273 .prm = OMAP2420_PRM_BASE, 272 .prm = OMAP2420_PRM_BASE,
274 .cm = OMAP2420_CM_BASE, 273 .cm = OMAP2420_CM_BASE,
275 .uart1_phys = OMAP2_UART1_BASE,
276 .uart2_phys = OMAP2_UART2_BASE,
277 .uart3_phys = OMAP2_UART3_BASE,
278}; 274};
279 275
280void __init omap2_set_globals_242x(void) 276void __init omap2_set_globals_242x(void)
@@ -293,9 +289,6 @@ static struct omap_globals omap243x_globals = {
293 .ctrl = OMAP243X_CTRL_BASE, 289 .ctrl = OMAP243X_CTRL_BASE,
294 .prm = OMAP2430_PRM_BASE, 290 .prm = OMAP2430_PRM_BASE,
295 .cm = OMAP2430_CM_BASE, 291 .cm = OMAP2430_CM_BASE,
296 .uart1_phys = OMAP2_UART1_BASE,
297 .uart2_phys = OMAP2_UART2_BASE,
298 .uart3_phys = OMAP2_UART3_BASE,
299}; 292};
300 293
301void __init omap2_set_globals_243x(void) 294void __init omap2_set_globals_243x(void)
@@ -314,10 +307,6 @@ static struct omap_globals omap3_globals = {
314 .ctrl = OMAP343X_CTRL_BASE, 307 .ctrl = OMAP343X_CTRL_BASE,
315 .prm = OMAP3430_PRM_BASE, 308 .prm = OMAP3430_PRM_BASE,
316 .cm = OMAP3430_CM_BASE, 309 .cm = OMAP3430_CM_BASE,
317 .uart1_phys = OMAP3_UART1_BASE,
318 .uart2_phys = OMAP3_UART2_BASE,
319 .uart3_phys = OMAP3_UART3_BASE,
320 .uart4_phys = OMAP3_UART4_BASE, /* Only on 3630 */
321}; 310};
322 311
323void __init omap2_set_globals_3xxx(void) 312void __init omap2_set_globals_3xxx(void)
@@ -341,10 +330,6 @@ static struct omap_globals omap4_globals = {
341 .prm = OMAP4430_PRM_BASE, 330 .prm = OMAP4430_PRM_BASE,
342 .cm = OMAP4430_CM_BASE, 331 .cm = OMAP4430_CM_BASE,
343 .cm2 = OMAP4430_CM2_BASE, 332 .cm2 = OMAP4430_CM2_BASE,
344 .uart1_phys = OMAP4_UART1_BASE,
345 .uart2_phys = OMAP4_UART2_BASE,
346 .uart3_phys = OMAP4_UART3_BASE,
347 .uart4_phys = OMAP4_UART4_BASE,
348}; 333};
349 334
350void __init omap2_set_globals_443x(void) 335void __init omap2_set_globals_443x(void)
@@ -352,7 +337,6 @@ void __init omap2_set_globals_443x(void)
352 omap2_set_globals_tap(&omap4_globals); 337 omap2_set_globals_tap(&omap4_globals);
353 omap2_set_globals_control(&omap4_globals); 338 omap2_set_globals_control(&omap4_globals);
354 omap2_set_globals_prcm(&omap4_globals); 339 omap2_set_globals_prcm(&omap4_globals);
355 omap2_set_globals_uart(&omap4_globals);
356} 340}
357#endif 341#endif
358 342
diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h
index 2d8f98d7ae50..a9d69a09920d 100644
--- a/arch/arm/plat-omap/include/plat/common.h
+++ b/arch/arm/plat-omap/include/plat/common.h
@@ -67,7 +67,6 @@ void omap2_set_globals_tap(struct omap_globals *);
67void omap2_set_globals_sdrc(struct omap_globals *); 67void omap2_set_globals_sdrc(struct omap_globals *);
68void omap2_set_globals_control(struct omap_globals *); 68void omap2_set_globals_control(struct omap_globals *);
69void omap2_set_globals_prcm(struct omap_globals *); 69void omap2_set_globals_prcm(struct omap_globals *);
70void omap2_set_globals_uart(struct omap_globals *);
71 70
72void omap3_map_io(void); 71void omap3_map_io(void);
73 72