diff options
author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2011-02-22 11:57:47 +0300 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-23 20:54:55 +0300 |
commit | 07787a85c0c664d434b522c8bdf7cdc636a16e75 (patch) | |
tree | 086def240a52b985992c2506e66b6586716f0410 /arch/arm/mach-omap2/timer-mpu.c | |
parent | af90f10d3826525306c96d423df240210640cb72 (diff) | |
download | linux-07787a85c0c664d434b522c8bdf7cdc636a16e75.tar.xz |
ARM: 6753/1: omap4: Enable ARM local timers with OMAP4430 es1.0 exception
On OMAP4430 ES1.0 the local timers are gated by security. Enable the
CONFIG_LOCAL_TIMERS for omap2plus build and handle the OMAP4430 es1.0
exception case.
This patch has dependency on the first patch in this series.
ARM: smp: Select local timers vs dummy timer support runtime
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2/timer-mpu.c')
-rw-r--r-- | arch/arm/mach-omap2/timer-mpu.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/timer-mpu.c b/arch/arm/mach-omap2/timer-mpu.c index 09c73dcfc2ac..31c0ac4cd66a 100644 --- a/arch/arm/mach-omap2/timer-mpu.c +++ b/arch/arm/mach-omap2/timer-mpu.c @@ -28,6 +28,10 @@ */ int __cpuinit local_timer_setup(struct clock_event_device *evt) { + /* Local timers are not supprted on OMAP4430 ES1.0 */ + if (omap_rev() == OMAP4430_REV_ES1_0) + return -ENXIO; + evt->irq = OMAP44XX_IRQ_LOCALTIMER; twd_timer_setup(evt); return 0; |