Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

[sfrench/cifs-2.6.git] / arch / arm / plat-omap / common.c

diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index cc050b3313bd0126c4b352a249bb159beb13acbb..bf1eaf3a27d452e915a83fb381ccc54490a4a88b 100644 (file)
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -280,16 +280,18 @@ void __init omap2_set_globals_343x(void)
 #if defined(CONFIG_ARCH_OMAP4)
 static struct omap_globals omap4_globals = {
        .class  = OMAP443X_CLASS,
-       .tap    = OMAP2_L4_IO_ADDRESS(0x4830a000),
+       .tap    = OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE),
        .ctrl   = OMAP2_L4_IO_ADDRESS(OMAP443X_CTRL_BASE),
        .prm    = OMAP2_L4_IO_ADDRESS(OMAP4430_PRM_BASE),
        .cm     = OMAP2_L4_IO_ADDRESS(OMAP4430_CM_BASE),
+       .cm2    = OMAP2_L4_IO_ADDRESS(OMAP4430_CM2_BASE),
 };
 
 void __init omap2_set_globals_443x(void)
 {
        omap2_set_globals_tap(&omap4_globals);
        omap2_set_globals_control(&omap4_globals);
+       omap2_set_globals_prcm(&omap4_globals);
 }
 #endif