* [PATCH] ARM: at91: rm9200: fix clock registration
@ 2014-09-05 14:15 Alexandre Belloni
2014-09-05 14:18 ` Boris BREZILLON
2014-09-05 15:26 ` Nicolas Ferre
0 siblings, 2 replies; 4+ messages in thread
From: Alexandre Belloni @ 2014-09-05 14:15 UTC (permalink / raw)
To: Nicolas Ferre
Cc: Jean-Christophe Plagniol-Villard, Boris Brezillon,
linux-arm-kernel, linux-kernel, Alexandre Belloni
Actually register clocks from device tree when using the common clock
framework.
Signed-off-by: Alexandre Belloni <alexandre.belloni@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,
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: at91: rm9200: fix clock registration
2014-09-05 14:15 [PATCH] ARM: at91: rm9200: fix clock registration Alexandre Belloni
@ 2014-09-05 14:18 ` Boris BREZILLON
2014-09-05 15:26 ` Nicolas Ferre
1 sibling, 0 replies; 4+ messages in thread
From: Boris BREZILLON @ 2014-09-05 14:18 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Nicolas Ferre, Jean-Christophe Plagniol-Villard,
linux-arm-kernel, linux-kernel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: at91: rm9200: fix clock registration
2014-09-05 14:15 [PATCH] ARM: at91: rm9200: fix clock registration Alexandre Belloni
2014-09-05 14:18 ` Boris BREZILLON
@ 2014-09-05 15:26 ` Nicolas Ferre
2014-09-05 15:27 ` Nicolas Ferre
1 sibling, 1 reply; 4+ messages in thread
From: Nicolas Ferre @ 2014-09-05 15:26 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Jean-Christophe Plagniol-Villard, Boris Brezillon,
linux-arm-kernel, linux-kernel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: at91: rm9200: fix clock registration
2014-09-05 15:26 ` Nicolas Ferre
@ 2014-09-05 15:27 ` Nicolas Ferre
0 siblings, 0 replies; 4+ messages in thread
From: Nicolas Ferre @ 2014-09-05 15:27 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Boris Brezillon, Jean-Christophe Plagniol-Villard, linux-kernel,
linux-arm-kernel
On 05/09/2014 17:26, Nicolas Ferre :
> 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.
s/18/17/
Sorry.
>
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-09-05 15:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-05 14:15 [PATCH] ARM: at91: rm9200: fix clock registration Alexandre Belloni
2014-09-05 14:18 ` Boris BREZILLON
2014-09-05 15:26 ` Nicolas Ferre
2014-09-05 15:27 ` Nicolas Ferre
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).