Hi Jon, On Wed, Jan 30, 2013 at 22:34:27, Hunter, Jon wrote: > 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 <jon-hunter@xxxxxx> > --- > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html