leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: OMAP1: Add checks for possible error condition in timer_init

Browse Source 
On OMAP1, omap_32k_timer_init() function always returns "true",
irrespective of whether error occurred while initializing 32k sync
counter as a kernel clocksource or not and execution will never
fallback to mpu_timer clocksource init code.

This patch adds check for return value from function
omap_init_clocksource_32k(), and fallback to omap_mpu_timer_init()
in case of failure/error from omap_init_clocksource_32k().

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Acked-by: Kevin Hilman <khilman@ti.com>
Tested-by: Kevin Hilman <khilman@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Vaibhav Hiremath 2012-05-09 10:07:05 -07:00 committed by Tony Lindgren
parent bfd1787986
commit 187999119d
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/mach-omap1/common.h
View File

@ -57,7 +57,14 @@ void omap1_init_irq(void);
void omap1_restart(char, const char *); void omap1_restart(char, const char *);
extern struct sys_timer omap1_timer; extern struct sys_timer omap1_timer;
extern bool omap_32k_timer_init(void); #ifdef CONFIG_OMAP_32K_TIMER
extern int omap_32k_timer_init(void);
#else
static inline int __init omap_32k_timer_init(void)
{
return -ENODEV;
}
#endif
extern void __init omap_init_consistent_dma_size(void); extern void __init omap_init_consistent_dma_size(void);
#endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */ #endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */

16
arch/arm/mach-omap1/time.c
View File

@ -232,20 +232,6 @@ static inline void omap_mpu_timer_init(void)
} }
#endif /* CONFIG_OMAP_MPU_TIMER */ #endif /* CONFIG_OMAP_MPU_TIMER */
static inline int omap_32k_timer_usable(void)
{
int res = false;
if (cpu_is_omap730() || cpu_is_omap15xx())
return res;
#ifdef CONFIG_OMAP_32K_TIMER
res = omap_32k_timer_init();
#endif
return res;
}
/* /*
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------
* Timer initialization * Timer initialization
@ -253,7 +239,7 @@ static inline int omap_32k_timer_usable(void)
*/ */
static void __init omap1_timer_init(void) static void __init omap1_timer_init(void)
{ {
if (!omap_32k_timer_usable()) if (omap_32k_timer_init() != 0)
omap_mpu_timer_init(); omap_mpu_timer_init();
} }

13
arch/arm/mach-omap1/timer32k.c
View File

@ -182,10 +182,15 @@ static __init void omap_init_32k_timer(void)
* Timer initialization * Timer initialization
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------
*/ */
bool __init omap_32k_timer_init(void) int __init omap_32k_timer_init(void)
{ {
omap_init_clocksource_32k(); int ret = -ENODEV;
omap_init_32k_timer();
return true; if (cpu_is_omap16xx())
ret = omap_init_clocksource_32k();
if (!ret)
omap_init_32k_timer();
return ret;
} }