diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-09-27 10:22:16 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-09-27 10:22:16 -0700 |
| commit | ee6f5a2fec84479d468ebf2a5d4560e042a58647 (patch) | |
| tree | 30a8e7644843dbeb60e45cd554c64782c17107be /arch/arm/mach-omap2 | |
| parent | 98bb8c3e98267f2aa422bbafce3b734016e7ed02 (diff) | |
| parent | d31f59f31d602e8c3a34ce1f20d1e8fcfe50dd59 (diff) | |
Merge branch 'devel-omap-smp-on-up' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/timer-gp.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index b48bacf0a7a..bb85f24c364 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -35,7 +35,7 @@ config ARCH_OMAP3 default y select CPU_V7 select USB_ARCH_HAS_EHCI - select ARM_L1_CACHE_SHIFT_6 + select ARM_L1_CACHE_SHIFT_6 if !ARCH_OMAP4 config ARCH_OMAP4 bool "TI OMAP4" @@ -43,6 +43,8 @@ config ARCH_OMAP4 depends on ARCH_OMAP2PLUS select CPU_V7 select ARM_GIC + select PL310_ERRATA_588369 + select ARM_ERRATA_720789 comment "OMAP Core Type" depends on ARCH_OMAP2 diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c index 74fbed8491f..5a3e606dc44 100644 --- a/arch/arm/mach-omap2/timer-gp.c +++ b/arch/arm/mach-omap2/timer-gp.c @@ -228,8 +228,10 @@ static void __init omap2_gp_clocksource_init(void) static void __init omap2_gp_timer_init(void) { #ifdef CONFIG_LOCAL_TIMERS - twd_base = ioremap(OMAP44XX_LOCAL_TWD_BASE, SZ_256); - BUG_ON(!twd_base); + if (cpu_is_omap44xx()) { + twd_base = ioremap(OMAP44XX_LOCAL_TWD_BASE, SZ_256); + BUG_ON(!twd_base); + } #endif omap_dm_timer_init(); |