aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/Makefile
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2012-01-10 19:44:19 +0000
committerMarc Zyngier <marc.zyngier@arm.com>2012-03-13 13:45:53 +0000
commit58458e0327f7a34ef9c8bc512290bf47e3de811b (patch)
tree247ca75e7eda3f1be5ba878e33d63bfe77b48135 /arch/arm/mach-imx/Makefile
parentARM: highbank: convert to twd_local_timer_register() interface (diff)
downloadlinux-dev-58458e0327f7a34ef9c8bc512290bf47e3de811b.tar.xz
linux-dev-58458e0327f7a34ef9c8bc512290bf47e3de811b.zip
ARM: imx6q: convert to twd_local_timer_register() interface
Add support for the new smp_twd runtime registration interface to the imx6q platforms, and remove the old compile-time support. The imx6q DTS file is updated to match the TWD DT documentation. Also present in this patch a DTS fix to the timer interrupt routing (the PPI connection uses bits [15:8]) and trigger (rising edge). Acked-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/mach-imx/Makefile')
-rw-r--r--arch/arm/mach-imx/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 55db9c488f2b..190d57006163 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -71,7 +71,6 @@ obj-$(CONFIG_CPU_V7) += head-v7.o
AFLAGS_head-v7.o :=-Wa,-march=armv7-a
obj-$(CONFIG_SMP) += platsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
-obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o
obj-$(CONFIG_SOC_IMX6Q) += clock-imx6q.o mach-imx6q.o
ifeq ($(CONFIG_PM),y)