diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:42 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:42 -0400 |
| commit | b6825d2df55aa7d7341c715b577b73a6a03dc944 (patch) | |
| tree | ae4f0f52f4c2ad4e501dd323318486ccdd7fcd93 /arch/arm/plat-omap/common.c | |
| parent | 6defd90433729c2d795865165cb34d938d8ff07c (diff) | |
| parent | aa59e19d05114f9fb7718d6bc8398255476fb4f5 (diff) | |
Merge branch 'omap-all' into devel
Conflicts:
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/irq.c
Diffstat (limited to 'arch/arm/plat-omap/common.c')
| -rw-r--r-- | arch/arm/plat-omap/common.c | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 8bdf0ead0cf3..0843b8882f93 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c | |||
| @@ -248,6 +248,7 @@ static struct omap_globals *omap2_globals; | |||
| 248 | 248 | ||
| 249 | static void __init __omap2_set_globals(void) | 249 | static void __init __omap2_set_globals(void) |
| 250 | { | 250 | { |
| 251 | omap2_set_globals_tap(omap2_globals); | ||
| 251 | omap2_set_globals_memory(omap2_globals); | 252 | omap2_set_globals_memory(omap2_globals); |
| 252 | omap2_set_globals_control(omap2_globals); | 253 | omap2_set_globals_control(omap2_globals); |
| 253 | omap2_set_globals_prcm(omap2_globals); | 254 | omap2_set_globals_prcm(omap2_globals); |
| @@ -258,12 +259,13 @@ static void __init __omap2_set_globals(void) | |||
| 258 | #if defined(CONFIG_ARCH_OMAP2420) | 259 | #if defined(CONFIG_ARCH_OMAP2420) |
| 259 | 260 | ||
| 260 | static struct omap_globals omap242x_globals = { | 261 | static struct omap_globals omap242x_globals = { |
| 261 | .tap = (__force void __iomem *)OMAP2_IO_ADDRESS(0x48014000), | 262 | .class = OMAP242X_CLASS, |
| 262 | .sdrc = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_SDRC_BASE), | 263 | .tap = OMAP2_IO_ADDRESS(0x48014000), |
| 263 | .sms = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_SMS_BASE), | 264 | .sdrc = OMAP2_IO_ADDRESS(OMAP2420_SDRC_BASE), |
| 264 | .ctrl = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_CTRL_BASE), | 265 | .sms = OMAP2_IO_ADDRESS(OMAP2420_SMS_BASE), |
| 265 | .prm = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_PRM_BASE), | 266 | .ctrl = OMAP2_IO_ADDRESS(OMAP2420_CTRL_BASE), |
| 266 | .cm = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_CM_BASE), | 267 | .prm = OMAP2_IO_ADDRESS(OMAP2420_PRM_BASE), |
| 268 | .cm = OMAP2_IO_ADDRESS(OMAP2420_CM_BASE), | ||
| 267 | }; | 269 | }; |
| 268 | 270 | ||
| 269 | void __init omap2_set_globals_242x(void) | 271 | void __init omap2_set_globals_242x(void) |
| @@ -276,12 +278,13 @@ void __init omap2_set_globals_242x(void) | |||
| 276 | #if defined(CONFIG_ARCH_OMAP2430) | 278 | #if defined(CONFIG_ARCH_OMAP2430) |
| 277 | 279 | ||
| 278 | static struct omap_globals omap243x_globals = { | 280 | static struct omap_globals omap243x_globals = { |
| 279 | .tap = (__force void __iomem *)OMAP2_IO_ADDRESS(0x4900a000), | 281 | .class = OMAP243X_CLASS, |
| 280 | .sdrc = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP243X_SDRC_BASE), | 282 | .tap = OMAP2_IO_ADDRESS(0x4900a000), |
| 281 | .sms = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP243X_SMS_BASE), | 283 | .sdrc = OMAP2_IO_ADDRESS(OMAP243X_SDRC_BASE), |
| 282 | .ctrl = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP243X_CTRL_BASE), | 284 | .sms = OMAP2_IO_ADDRESS(OMAP243X_SMS_BASE), |
| 283 | .prm = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2430_PRM_BASE), | 285 | .ctrl = OMAP2_IO_ADDRESS(OMAP243X_CTRL_BASE), |
| 284 | .cm = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2430_CM_BASE), | 286 | .prm = OMAP2_IO_ADDRESS(OMAP2430_PRM_BASE), |
| 287 | .cm = OMAP2_IO_ADDRESS(OMAP2430_CM_BASE), | ||
| 285 | }; | 288 | }; |
| 286 | 289 | ||
| 287 | void __init omap2_set_globals_243x(void) | 290 | void __init omap2_set_globals_243x(void) |
| @@ -294,12 +297,13 @@ void __init omap2_set_globals_243x(void) | |||
| 294 | #if defined(CONFIG_ARCH_OMAP3430) | 297 | #if defined(CONFIG_ARCH_OMAP3430) |
| 295 | 298 | ||
| 296 | static struct omap_globals omap343x_globals = { | 299 | static struct omap_globals omap343x_globals = { |
| 297 | .tap = (__force void __iomem *)OMAP2_IO_ADDRESS(0x4830A000), | 300 | .class = OMAP343X_CLASS, |
| 298 | .sdrc = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE), | 301 | .tap = OMAP2_IO_ADDRESS(0x4830A000), |
| 299 | .sms = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE), | 302 | .sdrc = OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE), |
| 300 | .ctrl = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE), | 303 | .sms = OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE), |
| 301 | .prm = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP3430_PRM_BASE), | 304 | .ctrl = OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE), |
| 302 | .cm = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP3430_CM_BASE), | 305 | .prm = OMAP2_IO_ADDRESS(OMAP3430_PRM_BASE), |
| 306 | .cm = OMAP2_IO_ADDRESS(OMAP3430_CM_BASE), | ||
| 303 | }; | 307 | }; |
| 304 | 308 | ||
| 305 | void __init omap2_set_globals_343x(void) | 309 | void __init omap2_set_globals_343x(void) |