From: nicolas.ferre@atmel.com (Nicolas Ferre)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/6] ARM: at91: prepare common clk transition for sama5d3 SoC
Date: Wed, 9 Oct 2013 15:05:32 +0200 [thread overview]
Message-ID: <5255549C.4050009@atmel.com> (raw)
In-Reply-To: <1375953690-11207-1-git-send-email-b.brezillon@overkiz.com>
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
next prev parent reply other threads:[~2013-10-09 13:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-08 8:46 [PATCH 0/6] ARM: at91: use new at91 clks for samad3 SoCs Boris BREZILLON
2013-08-08 9:20 ` [PATCH 1/6] ARM: at91: prepare sama5 dt boards transition to common clk Boris BREZILLON
2013-10-09 13:04 ` Nicolas Ferre
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 message]
2013-08-08 9:31 ` [PATCH 3/6] ARM: at91/dt: define sama5d3 clocks Boris BREZILLON
2013-10-09 13:10 ` Nicolas Ferre
2013-08-08 9:36 ` [PATCH 4/6] ARM: at91/dt: define sama5d3xek's main clk frequency Boris BREZILLON
2013-10-09 13:12 ` Nicolas Ferre
2013-08-08 10:29 ` [PATCH 5/6] ARM: at91: move sama5d3 SoC to common clk Boris BREZILLON
2013-10-09 13:12 ` Nicolas Ferre
2013-08-08 10:30 ` [PATCH 6/6] ARM: at91/dt: remove old main clk definition from sama5d3xcm.dtsi Boris BREZILLON
2013-10-09 13:14 ` Nicolas Ferre
2013-08-08 10:33 ` [PATCH 0/6] ARM: at91: use new at91 clks for samad3 SoCs boris brezillon
-- strict thread matches above, loose matches on Subject: below --
2013-08-08 8:47 [PATCH 2/6] ARM: at91: prepare common clk transition for sama5d3 SoC Boris BREZILLON
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=5255549C.4050009@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).