aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/plat-omap/Makefile
diff options
context:
space:
mode:
authorKevin Hilman <khilman@mvista.com>2007-11-12 23:24:02 -0800
committerTony Lindgren <tony@atomide.com>2008-04-14 09:57:12 -0700
commit5a3a388fbefac3705dfcde16c93fc81e6fd9378f (patch)
treecb32a3a40650dfa2ae72b0aefffef30b3d566ec0 /arch/arm/plat-omap/Makefile
parent225dfda1d676b70acf1e696ace68c23297926ce0 (diff)
ARM: OMAP: Timer32K: Re-organize duplicated 32k-timer code
On OMAP2/3, the gp-timer code can be used for a 32kHz timer simply by setting the source to be the 32k clock instead of sys_clk. This patch uses the mach-omap2/timer-gp.c code for 32kHz timer on OMAP2, moving the logic into mach-omap2/timer-gp.c, and not using plat-omap/timer32k.c which, for OMAP2, is redundant with the timer-gp code. Also, if CONFIG_OMAP_32K_TIMER is enabled, the gptimer-based clocksource is not used. Instead the default 32k sync counter is used as the clocksource (see the clocksource in plat-omap/common.c.) This is important for sleep/suspend so there is a valid counter during sleep. Note that the suspend/sleep code needs fixing to check for overflows of this counter. In addition, the OMAP2/3 details are removed from timer32k.c leaving that with only OMAP1 specifics. A follow-up patch will move it from plat-omap common code to mach-omap1. Signed-off-by: Kevin Hilman <khilman@mvista.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/Makefile')
-rw-r--r--arch/arm/plat-omap/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index 8f56c255d1e..d91424edf57 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -9,7 +9,9 @@ obj-m :=
obj-n :=
obj- :=
+ifeq ($(CONFIG_ARCH_OMAP1),y)
obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o
+endif
# OCPI interconnect support for 1710, 1610 and 5912
obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o