public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Boris BREZILLON <boris.brezillon@free-electrons.com>
To: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>,
	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ARM: at91: rm9200: fix clock registration
Date: Fri, 5 Sep 2014 16:18:37 +0200	[thread overview]
Message-ID: <20140905161837.7b83929c@bbrezillon> (raw)
In-Reply-To: <1409926533-7853-1-git-send-email-alexandre.belloni@free-electrons.com>

On Fri,  5 Sep 2014 16:15:33 +0200
Alexandre Belloni <alexandre.belloni@free-electrons.com> wrote:

> Actually register clocks from device tree when using the common clock
> framework.
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

Acked-by: Boris Brezillon <boris.brezillon@free-electrons.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,



-- 
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

  reply	other threads:[~2014-09-05 14:18 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-05 14:15 [PATCH] ARM: at91: rm9200: fix clock registration Alexandre Belloni
2014-09-05 14:18 ` Boris BREZILLON [this message]
2014-09-05 15:26 ` Nicolas Ferre
2014-09-05 15:27   ` Nicolas Ferre

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140905161837.7b83929c@bbrezillon \
    --to=boris.brezillon@free-electrons.com \
    --cc=alexandre.belloni@free-electrons.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nicolas.ferre@atmel.com \
    --cc=plagnioj@jcrosoft.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox