diff options
| author | Boris BREZILLON <b.brezillon@overkiz.com> | 2013-12-02 15:10:48 +0100 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2013-12-02 15:31:28 +0100 |
| commit | d1ff2300228e54f1d748f810a28134f4e6f160c7 (patch) | |
| tree | 494a60f682c471e1f89219bd9b7ded2ff604bda8 /arch | |
| parent | d4d24c1b4f74e055905db6e677a2ba05f55de30a (diff) | |
| download | talos-obmc-linux-d1ff2300228e54f1d748f810a28134f4e6f160c7.tar.gz talos-obmc-linux-d1ff2300228e54f1d748f810a28134f4e6f160c7.zip | |
ARM: at91: prepare common clk transition for sama5d3 SoC
This patch encloses sama5d3 old clk registration in
"#if defined(CONFIG_OLD_CLK_AT91) #endif" sections.
Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-at91/sama5d3.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/sama5d3.c b/arch/arm/mach-at91/sama5d3.c index 5c6dc24fafbd..f3313b9d084a 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 @@ -378,6 +380,8 @@ static void __init sama5d3_initialize(void) AT91_SOC_START(sama5d3) .map_io = sama5d3_map_io, +#if defined(CONFIG_OLD_CLK_AT91) .register_clocks = sama5d3_register_clocks, +#endif .init = sama5d3_initialize, AT91_SOC_END |
