* [PATCH 2/6] ARM: at91: prepare common clk transition for sama5d3 SoC
@ 2013-08-08 8:47 Boris BREZILLON
0 siblings, 0 replies; 3+ messages in thread
From: Boris BREZILLON @ 2013-08-08 8:47 UTC (permalink / raw)
To: linux-arm-kernel
This patch enclose sama5d3 old clk registration in
"#if defined(CONFIG_OLD_CLK_AT91) #endif" sections.
Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
---
arch/arm/mach-at91/sama5d3.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-at91/sama5d3.c b/arch/arm/mach-at91/sama5d3.c
index 0003949..3426098 100644
--- a/arch/arm/mach-at91/sama5d3.c
+++ b/arch/arm/mach-at91/sama5d3.c
@@ -19,9 +19,10 @@
#include "soc.h"
#include "generic.h"
-#include "clock.h"
#include "sam9_smc.h"
+#if defined(CONFIG_OLD_CLK_AT91)
+#include "clock.h"
/* --------------------------------------------------------------------
* Clocks
* -------------------------------------------------------------------- */
@@ -361,6 +362,7 @@ static void __init sama5d3_register_clocks(void)
clk_register(&pck1);
clk_register(&pck2);
}
+#endif
/* --------------------------------------------------------------------
* AT91SAM9x5 processor initialization
@@ -373,5 +375,7 @@ static void __init sama5d3_map_io(void)
AT91_SOC_START(sama5d3)
.map_io = sama5d3_map_io,
+#if defined(CONFIG_OLD_CLK_AT91)
.register_clocks = sama5d3_register_clocks,
+#endif
AT91_SOC_END
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 0/6] ARM: at91: use new at91 clks for samad3 SoCs
@ 2013-08-08 8:46 Boris BREZILLON
2013-08-08 9:21 ` [PATCH 2/6] ARM: at91: prepare common clk transition for sama5d3 SoC Boris BREZILLON
0 siblings, 1 reply; 3+ messages in thread
From: Boris BREZILLON @ 2013-08-08 8:46 UTC (permalink / raw)
To: linux-arm-kernel
Hello,
This patch series was formerly part of the
"ARM: at91: move to common clk framework" patch series.
It moves sama5d3 SoCs and boards to the new at91 clks (clk implementation
using common clk framework).
This patch series depends on following patch series (they must be applied in
this order):
1) "ARM: at91/dt: split sama5d3 definition" (v1)
2) "ARM: at91/dt: make use of periph id macros" (v2, not submitted yet)
3) "ARM: at91: move to common clk framework" (v3)
I will answer to this mail and join this patch series' dependencies in
attachments.
Best Regards,
Boris
Boris BREZILLON (6):
ARM: at91: prepare sama5 dt boards transition to common clk
ARM: at91: prepare common clk transition for sama5d3 SoC
ARM: at91/dt: define sama5d3 clocks
ARM: at91/dt: define sama5d3xek's main clk frequency
ARM: at91: move sama5d3 SoC to common clk
ARM: at91/dt: remove old main clk definition from sama5d3xcm.dtsi
arch/arm/boot/dts/sama5d3.dtsi | 331 ++++++++++++++++++++++++++++++++++-
arch/arm/boot/dts/sama5d3_can.dtsi | 19 ++
arch/arm/boot/dts/sama5d3_emac.dtsi | 12 ++
arch/arm/boot/dts/sama5d3_gmac.dtsi | 12 ++
arch/arm/boot/dts/sama5d3_lcd.dtsi | 17 ++
arch/arm/boot/dts/sama5d3_mci2.dtsi | 11 ++
arch/arm/boot/dts/sama5d3_tcb1.dtsi | 12 ++
arch/arm/boot/dts/sama5d3_uart.dtsi | 19 ++
arch/arm/boot/dts/sama5d3xcm.dtsi | 17 +-
arch/arm/mach-at91/Kconfig | 1 -
arch/arm/mach-at91/board-dt-sama5.c | 10 +-
arch/arm/mach-at91/sama5d3.c | 6 +-
12 files changed, 451 insertions(+), 16 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/6] ARM: at91: prepare common clk transition for sama5d3 SoC
2013-08-08 8:46 [PATCH 0/6] ARM: at91: use new at91 clks for samad3 SoCs Boris BREZILLON
@ 2013-08-08 9:21 ` Boris BREZILLON
2013-10-09 13:05 ` Nicolas Ferre
0 siblings, 1 reply; 3+ messages in thread
From: Boris BREZILLON @ 2013-08-08 9:21 UTC (permalink / raw)
To: linux-arm-kernel
This patch enclose sama5d3 old clk registration in
"#if defined(CONFIG_OLD_CLK_AT91) #endif" sections.
Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
---
arch/arm/mach-at91/sama5d3.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-at91/sama5d3.c b/arch/arm/mach-at91/sama5d3.c
index 0003949..3426098 100644
--- a/arch/arm/mach-at91/sama5d3.c
+++ b/arch/arm/mach-at91/sama5d3.c
@@ -19,9 +19,10 @@
#include "soc.h"
#include "generic.h"
-#include "clock.h"
#include "sam9_smc.h"
+#if defined(CONFIG_OLD_CLK_AT91)
+#include "clock.h"
/* --------------------------------------------------------------------
* Clocks
* -------------------------------------------------------------------- */
@@ -361,6 +362,7 @@ static void __init sama5d3_register_clocks(void)
clk_register(&pck1);
clk_register(&pck2);
}
+#endif
/* --------------------------------------------------------------------
* AT91SAM9x5 processor initialization
@@ -373,5 +375,7 @@ static void __init sama5d3_map_io(void)
AT91_SOC_START(sama5d3)
.map_io = sama5d3_map_io,
+#if defined(CONFIG_OLD_CLK_AT91)
.register_clocks = sama5d3_register_clocks,
+#endif
AT91_SOC_END
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/6] ARM: at91: prepare common clk transition for sama5d3 SoC
2013-08-08 9:21 ` [PATCH 2/6] ARM: at91: prepare common clk transition for sama5d3 SoC Boris BREZILLON
@ 2013-10-09 13:05 ` Nicolas Ferre
0 siblings, 0 replies; 3+ messages in thread
From: Nicolas Ferre @ 2013-10-09 13:05 UTC (permalink / raw)
To: linux-arm-kernel
On 08/08/2013 11:21, Boris BREZILLON :
> This patch enclose sama5d3 old clk registration in
> "#if defined(CONFIG_OLD_CLK_AT91) #endif" sections.
>
> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
And... do not forget to remove completely the code when transition is
done (ie: in "[PATCH 6/6] ARM: at91/dt: remove old main clk definition
from sama5d3xcm.dtsi").
> ---
> arch/arm/mach-at91/sama5d3.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-at91/sama5d3.c b/arch/arm/mach-at91/sama5d3.c
> index 0003949..3426098 100644
> --- a/arch/arm/mach-at91/sama5d3.c
> +++ b/arch/arm/mach-at91/sama5d3.c
> @@ -19,9 +19,10 @@
>
> #include "soc.h"
> #include "generic.h"
> -#include "clock.h"
> #include "sam9_smc.h"
>
> +#if defined(CONFIG_OLD_CLK_AT91)
> +#include "clock.h"
> /* --------------------------------------------------------------------
> * Clocks
> * -------------------------------------------------------------------- */
> @@ -361,6 +362,7 @@ static void __init sama5d3_register_clocks(void)
> clk_register(&pck1);
> clk_register(&pck2);
> }
> +#endif
>
> /* --------------------------------------------------------------------
> * AT91SAM9x5 processor initialization
> @@ -373,5 +375,7 @@ static void __init sama5d3_map_io(void)
>
> AT91_SOC_START(sama5d3)
> .map_io = sama5d3_map_io,
> +#if defined(CONFIG_OLD_CLK_AT91)
> .register_clocks = sama5d3_register_clocks,
> +#endif
> AT91_SOC_END
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-10-09 13:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-08 8:47 [PATCH 2/6] ARM: at91: prepare common clk transition for sama5d3 SoC Boris BREZILLON
-- strict thread matches above, loose matches on Subject: below --
2013-08-08 8:46 [PATCH 0/6] ARM: at91: use new at91 clks for samad3 SoCs Boris BREZILLON
2013-08-08 9:21 ` [PATCH 2/6] ARM: at91: prepare common clk transition for sama5d3 SoC Boris BREZILLON
2013-10-09 13:05 ` 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).