Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 10:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: at91: prepare common clk transition for sama5d3 SoC

Browse Source 
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>
This commit is contained in:
Boris BREZILLON 2013-12-02 15:10:48 +01:00 committed by Nicolas Ferre
parent d4d24c1b4f
commit d1ff230022
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-at91/sama5d3.c
View File

@ -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