>
Like several of the other files in drivers/clocksource,
tegra20_timer.c contains code that can only compile when CONFIG_ARM is
enabled. This causes obvious problems when trying to compile this
code for NVIDIA ARM64-based SoCs, such as Tegra132. The same timer IP
blocks exist, so it seems appropriate to provide support for them.
So until we figure out a better way to partition this code, wrap the
delay_timer and persistent_clock support code with preprocessor tests
for CONFIG_ARM.
(The delay_timer code should not be needed at all on
ARM64 due to the presence of the ARMv8 architected timer. The
persistent_clock support code could become important once power
management modes are implemented that turn off the CPU complex.)
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Signed-off-by: Paul Walmsley <pwalmsley@xxxxxxxxxx>
Cc: Allen Martin <amartin@xxxxxxxxxx>
Cc: Stephen Warren <swarren@xxxxxxxxxx>
Cc: Thierry Reding <treding@xxxxxxxxxx>
Cc: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Alexandre Courbot <gnurou@xxxxxxxxx>
---
Applies against next-20141209.
Intended for v3.20.
Boot-tested on Tegra124 Jetson TK1 on next-20141209.
Also boot-tested on Tegra132 Norrin FFD on next-20141209 + extra,
unrelated patches.
drivers/clocksource/tegra20_timer.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/clocksource/tegra20_timer.c b/drivers/clocksource/tegra20_timer.c
index d2616ef16770..83a8f5c9e139 100644
--- a/drivers/clocksource/tegra20_timer.c
+++ b/drivers/clocksource/tegra20_timer.c
@@ -29,8 +29,10 @@
#include <linux/sched_clock.h>
#include <linux/delay.h>
+#ifdef CONFIG_ARM
#include <asm/mach/time.h>
#include <asm/smp_twd.h>
+#endif