[PATCH 1/5] ARM: OMAP2+: Display correct system timer name
From: Bedia, Vaibhav <hidden>
Date: 2013-02-01 08:41:37
Also in:
linux-omap
Hi Jon, On Wed, Jan 30, 2013 at 22:34:27, Hunter, Jon wrote:
quoted hunk ↗ jump to hunk
Currently on boot, when displaying the name of the gptimer used for clockevents and clocksource timers, the timer ID is shown. However, when booting with device-tree, the timer ID is not used to select a gptimer but a timer property. Hence, it is possible that the timer selected when booting with device-tree does not match the ID shown. Therefore, instead display the HWMOD name of the gptimer and use the HWMOD name as the name of clockevent and clocksource timer (if a gptimer is used). Signed-off-by: Jon Hunter <redacted> --- arch/arm/mach-omap2/timer.c | 44 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-)diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 72c2ca1..18cb856 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c@@ -71,6 +71,9 @@ #define INCREMENTER_DENUMERATOR_RELOAD_OFFSET 0x14 #define NUMERATOR_DENUMERATOR_MASK 0xfffff000 +/* Timer name needs to be big enough to store a string of "timerXX" */ +static char timer_name[10]; +
Why not move this inside omap_dm_timer_init_one()? Regards, Vaibhav