> -----Original Message----- > From: Santosh Shilimkar [mailto:santosh.shilimkar@xxxxxx] > Sent: Saturday, February 12, 2011 5:00 PM > To: linux-omap@xxxxxxxxxxxxxxx > Cc: khilman@xxxxxx; linux-arm-kernel@xxxxxxxxxxxxxxxxxxx; > tony@xxxxxxxxxxx; Santosh Shilimkar > Subject: [PATCH 2/5] omap4: Enable ARM local timers with OMAP4430 > es1.0 exception > [....] > diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach- > omap2/Kconfig > index 1a2cf62..f285dd7 100644 > --- a/arch/arm/mach-omap2/Kconfig > +++ b/arch/arm/mach-omap2/Kconfig > @@ -44,6 +44,7 @@ config ARCH_OMAP4 > depends on ARCH_OMAP2PLUS > select CPU_V7 > select ARM_GIC > + select LOCAL_TIMERS This change should be 'select LOCAL_TIMERS if SMP' Otherwise, with !SMP, the build will break. Here is the updated version with Tony's ack added. -------- >From f76f0efffafccf76be7d820f2f775311b06087bd Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar <santosh.shilimkar@xxxxxx> Date: Thu, 27 Jan 2011 17:10:34 +0530 Subject: [PATCH] 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@xxxxxx> Acked-by: Tony Lindgren <tony@xxxxxxxxxxx> --- arch/arm/mach-omap2/Kconfig | 1 + arch/arm/mach-omap2/timer-mpu.c | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 1a2cf62..f285dd7 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -44,6 +44,7 @@ config ARCH_OMAP4 depends on ARCH_OMAP2PLUS select CPU_V7 select ARM_GIC + select LOCAL_TIMERS select PL310_ERRATA_588369 select ARM_ERRATA_720789 select ARCH_HAS_OPP diff --git a/arch/arm/mach-omap2/timer-mpu.c b/arch/arm/mach-omap2/timer-mpu.c index 09c73dc..31c0ac4 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; -- 1.6.0.4
Attachment:
0002-omap4-Enable-ARM-local-timers-with-OMAP4430-es1.0-e.patch
Description: Binary data
