diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2012-01-10 14:44:19 -0500 |
---|---|---|
committer | Marc Zyngier <marc.zyngier@arm.com> | 2012-03-13 09:45:53 -0400 |
commit | 58458e0327f7a34ef9c8bc512290bf47e3de811b (patch) | |
tree | 247ca75e7eda3f1be5ba878e33d63bfe77b48135 /arch/arm/mach-imx/Makefile | |
parent | 7ac9b9eb338d3960fbc044cb76790f4aab4fbb22 (diff) |
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/Makefile | 1 |
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 | |||
71 | AFLAGS_head-v7.o :=-Wa,-march=armv7-a | 71 | AFLAGS_head-v7.o :=-Wa,-march=armv7-a |
72 | obj-$(CONFIG_SMP) += platsmp.o | 72 | obj-$(CONFIG_SMP) += platsmp.o |
73 | obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o | 73 | obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o |
74 | obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o | ||
75 | obj-$(CONFIG_SOC_IMX6Q) += clock-imx6q.o mach-imx6q.o | 74 | obj-$(CONFIG_SOC_IMX6Q) += clock-imx6q.o mach-imx6q.o |
76 | 75 | ||
77 | ifeq ($(CONFIG_PM),y) | 76 | ifeq ($(CONFIG_PM),y) |