Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1b56b17f9903b6a17b8bb8d72d885f6d12b4d597

Authored by Linus Walleij
Committed by Russell King
1 parent a7b0ab5bd0
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ARM: 7084/1: mach-integrator: retire some timer macros 

These macros are not used by anything since the switch to
generic time in commit b9cedda230793cbf58eb012ddadedd490cc8e129
so let's retire them.

Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 1 changed file with 0 additions and 12 deletions Side-by-side Diff

arch/arm/mach-integrator/integrator_ap.c
Diff comments   View file @ 1b56b17
... ... @@ -320,18 +320,6 @@
320 320 #define TIMER1_VA_BASE IO_ADDRESS(INTEGRATOR_TIMER1_BASE)
321 321 #define TIMER2_VA_BASE IO_ADDRESS(INTEGRATOR_TIMER2_BASE)
322 322  
323   -/*
324   - * How long is the timer interval?
325   - */
326   -#define TIMER_INTERVAL (TICKS_PER_uSEC * mSEC_10)
327   -#if TIMER_INTERVAL >= 0x100000
328   -#define TICKS2USECS(x) (256 * (x) / TICKS_PER_uSEC)
329   -#elif TIMER_INTERVAL >= 0x10000
330   -#define TICKS2USECS(x) (16 * (x) / TICKS_PER_uSEC)
331   -#else
332   -#define TICKS2USECS(x) ((x) / TICKS_PER_uSEC)
333   -#endif
334   -
335 323 static unsigned long timer_reload;
336 324  
337 325 static void integrator_clocksource_init(u32 khz)