On Tue, Aug 27, 2013 at 11:27:55PM +0200, Sebastian Hesselbarth wrote: > Most DT ARM machs require common clock providers initialized before timers. > Currently, arch/arm machs use .init_time to call clk_of_init right before > clocksource_of_init. This prevents to remove that hook and use the default > hook instead. clk_of_init is safe to call for non-DT platforms, so add > the call to ARM arch time_init by default. While at it, also reorder includes > alphabetically. > > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@xxxxxxxxx> > --- > Changelog: > v1->v2: > - reorder includes alphabetically > > Cc: Russell King <linux@xxxxxxxxxxxxxxxx> > Cc: Arnd Bergmann <arnd@xxxxxxxx> > Cc: linux-tegra@xxxxxxxxxxxxxxx > Cc: kernel@xxxxxxxxxxx > Cc: linux-samsung-soc@xxxxxxxxxxxxxxx > Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > Cc: linux-kernel@xxxxxxxxxxxxxxx > --- > arch/arm/kernel/time.c | 24 ++++++++++++++---------- > 1 files changed, 14 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c > index 98aee32..dd1028e 100644 > --- a/arch/arm/kernel/time.c > +++ b/arch/arm/kernel/time.c > @@ -11,25 +11,26 @@ [ ... ] > void __init time_init(void) > { > + /* initalize common clocks before timers */ > + of_clk_init(NULL); > + > if (machine_desc->init_time) > machine_desc->init_time(); > else This forces zynq to move some initialization our clock code relies on to init_irq(). Also, the current code already takes an approach of doing either common init or machine specific init. I think it might be better to move the call to of_clk_init() down into the else branch of the if-else. Though, this probably contradicts the purpose of the whole series. Sören -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html