lkml.org 
[lkml]   [2014]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] ARM: at91: rm9200: fix clock registration
On 05/09/2014 16:15, Alexandre Belloni :
> Actually register clocks from device tree when using the common clock
> framework.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

Indeed, thanks: I'll queue it in at91-3.18-fixes.

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>


> ---
> 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 <linux/gpio.h>
> #include <linux/of.h>
> #include <linux/of_irq.h>
> +#include <linux/clk-provider.h>
>
> #include <asm/setup.h>
> #include <asm/irq.h>
> @@ -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,
>


--
Nicolas Ferre


\
 
 \ /
  Last update: 2014-09-05 18:01    [W:0.034 / U:0.624 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site