Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1ff2300 authored by Boris Brezillon's avatar Boris Brezillon Committed by Nicolas Ferre
Browse files

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: default avatarBoris BREZILLON <b.brezillon@overkiz.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent d4d24c1b

arch/arm/mach-at91/sama5d3.c

+5 −1
Original line number Diff line number Diff line
@@ -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