From mboxrd@z Thu Jan 1 00:00:00 1970 From: boris.brezillon@free-electrons.com (Boris BREZILLON) Date: Fri, 5 Sep 2014 16:18:37 +0200 Subject: [PATCH] ARM: at91: rm9200: fix clock registration In-Reply-To: <1409926533-7853-1-git-send-email-alexandre.belloni@free-electrons.com> References: <1409926533-7853-1-git-send-email-alexandre.belloni@free-electrons.com> Message-ID: <20140905161837.7b83929c@bbrezillon> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, 5 Sep 2014 16:15:33 +0200 Alexandre Belloni wrote: > Actually register clocks from device tree when using the common clock > framework. > > Signed-off-by: Alexandre Belloni Acked-by: Boris Brezillon > --- > arch/arm/mach-at91/board-dt-rm9200.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-at91/board-dt-rm9200.c b/arch/arm/mach-at91/board-dt-rm9200.c > index 61ea21445664..a598481a3570 100644 > --- a/arch/arm/mach-at91/board-dt-rm9200.c > +++ b/arch/arm/mach-at91/board-dt-rm9200.c > @@ -14,6 +14,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -24,13 +25,21 @@ > #include "at91_aic.h" > #include "generic.h" > > +static void __init rm9200_dt_timer_init(void) > +{ > +#if defined(CONFIG_COMMON_CLK) > + of_clk_init(NULL); > +#endif > + at91rm9200_timer_init(); > +} > + > static const char *at91rm9200_dt_board_compat[] __initdata = { > "atmel,at91rm9200", > NULL > }; > > DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)") > - .init_time = at91rm9200_timer_init, > + .init_time = rm9200_dt_timer_init, > .map_io = at91_map_io, > .init_early = at91rm9200_dt_initialize, > .dt_compat = at91rm9200_dt_board_compat, -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com