From 7d211fec96d1d6b6d828f3bb4abc59180f6e3556 Mon Sep 17 00:00:00 2001 From: Andrew Ruder Date: Wed, 12 Aug 2015 13:18:31 -0500 Subject: arm: pxa: use common timer functions This patch moves pxa to the common timer functions added in commit 8dfafdd - Introduce common timer functions The (removed) pxa timer code (specifically __udelay()) could deadlock at the 32-bit boundary of get_ticks(). get_ticks() returned a 32-bit value cast up to a 64-bit value. If get_ticks() + tmo in __udelay() crossed the 32-bit boundary, the while condition became unconditionally true and locked the processor. Rather than patch the specific pxa issues, simply move everything over to the common code. Signed-off-by: Andrew Ruder Cc: Marek Vasut Cc: Tom Rini --- arch/arm/include/asm/config.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'arch/arm/include/asm/config.h') diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h index 7a34a0186c..22fff02778 100644 --- a/arch/arm/include/asm/config.h +++ b/arch/arm/include/asm/config.h @@ -19,7 +19,10 @@ #include #endif -#ifdef CONFIG_LS102XA +#if defined(CONFIG_LS102XA) || \ + defined(CONFIG_CPU_PXA27X) || \ + defined(CONFIG_CPU_MONAHANS) || \ + defined(CONFIG_CPU_PXA25X) #include #endif -- cgit v1.2.3