diff options
author | Kevin Hilman <khilman@ti.com> | 2011-01-21 17:30:15 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2011-03-09 19:15:50 -0500 |
commit | df93bd76b61639fe9093ccbfc5d1a4bfb744ec47 (patch) | |
tree | 56c49cafcd037c38d21c8122e026b5aae7b68667 /arch/arm | |
parent | 5c56f32e80ac8ea9878a0a5eb9ca99c703e953ab (diff) |
OMAP2+: remove unused UART base addresses from omap_globals
Now that omap_hwmod + omap_device is used for OMAP UART device and
driver code, we no longer need the UART physical addresses in
omap_globals.
Note that the #defines for the base addresses are still left in
<plat/serial.h> since they are used by DEBUG_LL and uncompress code.
Build tested for OMAP1 (omap1_defconfig) and OMAP2+ (omap2plus_defconfig)
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/common.c | 14 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/common.h | 4 |
2 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index 778929f7e92d..994f0f00c704 100644 --- a/arch/arm/mach-omap2/common.c +++ b/arch/arm/mach-omap2/common.c | |||
@@ -50,9 +50,6 @@ static struct omap_globals omap242x_globals = { | |||
50 | .ctrl = OMAP242X_CTRL_BASE, | 50 | .ctrl = OMAP242X_CTRL_BASE, |
51 | .prm = OMAP2420_PRM_BASE, | 51 | .prm = OMAP2420_PRM_BASE, |
52 | .cm = OMAP2420_CM_BASE, | 52 | .cm = OMAP2420_CM_BASE, |
53 | .uart1_phys = OMAP2_UART1_BASE, | ||
54 | .uart2_phys = OMAP2_UART2_BASE, | ||
55 | .uart3_phys = OMAP2_UART3_BASE, | ||
56 | }; | 53 | }; |
57 | 54 | ||
58 | void __init omap2_set_globals_242x(void) | 55 | void __init omap2_set_globals_242x(void) |
@@ -71,9 +68,6 @@ static struct omap_globals omap243x_globals = { | |||
71 | .ctrl = OMAP243X_CTRL_BASE, | 68 | .ctrl = OMAP243X_CTRL_BASE, |
72 | .prm = OMAP2430_PRM_BASE, | 69 | .prm = OMAP2430_PRM_BASE, |
73 | .cm = OMAP2430_CM_BASE, | 70 | .cm = OMAP2430_CM_BASE, |
74 | .uart1_phys = OMAP2_UART1_BASE, | ||
75 | .uart2_phys = OMAP2_UART2_BASE, | ||
76 | .uart3_phys = OMAP2_UART3_BASE, | ||
77 | }; | 71 | }; |
78 | 72 | ||
79 | void __init omap2_set_globals_243x(void) | 73 | void __init omap2_set_globals_243x(void) |
@@ -92,10 +86,6 @@ static struct omap_globals omap3_globals = { | |||
92 | .ctrl = OMAP343X_CTRL_BASE, | 86 | .ctrl = OMAP343X_CTRL_BASE, |
93 | .prm = OMAP3430_PRM_BASE, | 87 | .prm = OMAP3430_PRM_BASE, |
94 | .cm = OMAP3430_CM_BASE, | 88 | .cm = OMAP3430_CM_BASE, |
95 | .uart1_phys = OMAP3_UART1_BASE, | ||
96 | .uart2_phys = OMAP3_UART2_BASE, | ||
97 | .uart3_phys = OMAP3_UART3_BASE, | ||
98 | .uart4_phys = OMAP3_UART4_BASE, /* Only on 3630 */ | ||
99 | }; | 89 | }; |
100 | 90 | ||
101 | void __init omap2_set_globals_3xxx(void) | 91 | void __init omap2_set_globals_3xxx(void) |
@@ -119,10 +109,6 @@ static struct omap_globals omap4_globals = { | |||
119 | .prm = OMAP4430_PRM_BASE, | 109 | .prm = OMAP4430_PRM_BASE, |
120 | .cm = OMAP4430_CM_BASE, | 110 | .cm = OMAP4430_CM_BASE, |
121 | .cm2 = OMAP4430_CM2_BASE, | 111 | .cm2 = OMAP4430_CM2_BASE, |
122 | .uart1_phys = OMAP4_UART1_BASE, | ||
123 | .uart2_phys = OMAP4_UART2_BASE, | ||
124 | .uart3_phys = OMAP4_UART3_BASE, | ||
125 | .uart4_phys = OMAP4_UART4_BASE, | ||
126 | }; | 112 | }; |
127 | 113 | ||
128 | void __init omap2_set_globals_443x(void) | 114 | void __init omap2_set_globals_443x(void) |
diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h index 29b2afb4288f..1b8095bb8d00 100644 --- a/arch/arm/plat-omap/include/plat/common.h +++ b/arch/arm/plat-omap/include/plat/common.h | |||
@@ -56,10 +56,6 @@ struct omap_globals { | |||
56 | unsigned long prm; /* Power and Reset Management */ | 56 | unsigned long prm; /* Power and Reset Management */ |
57 | unsigned long cm; /* Clock Management */ | 57 | unsigned long cm; /* Clock Management */ |
58 | unsigned long cm2; | 58 | unsigned long cm2; |
59 | unsigned long uart1_phys; | ||
60 | unsigned long uart2_phys; | ||
61 | unsigned long uart3_phys; | ||
62 | unsigned long uart4_phys; | ||
63 | }; | 59 | }; |
64 | 60 | ||
65 | void omap2_set_globals_242x(void); | 61 | void omap2_set_globals_242x(void); |