Skip to content

Commit

Permalink
ARM: 6753/1: omap4: Enable ARM local timers with OMAP4430 es1.0 excep…
Browse files Browse the repository at this point in the history
…tion

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>
  • Loading branch information
Santosh Shilimkar authored and Russell King committed Feb 23, 2011
1 parent af90f10 commit 07787a8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ config ARCH_OMAP4
depends on ARCH_OMAP2PLUS
select CPU_V7
select ARM_GIC
select LOCAL_TIMERS if SMP
select PL310_ERRATA_588369
select ARM_ERRATA_720789
select ARCH_HAS_OPP
Expand Down
4 changes: 4 additions & 0 deletions arch/arm/mach-omap2/timer-mpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 07787a8

Please sign in to comment.