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

Commit 02c57779 authored by Jean-Jacques Hiblot's avatar Jean-Jacques Hiblot Committed by Nicolas Ferre
Browse files

ARM: at91: prepare common clk transition for sam9261 SoC 



This patch encloses sam9261 old clk registration in
"#if defined(CONFIG_OLD_CLK_AT91) #endif" sections.

Signed-off-by: default avatarJean-Jacques Hiblot <jjhiblot@traphandler.com>
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent b646b9cf

arch/arm/mach-at91/at91sam9261.c

+6 −2
Original line number Diff line number Diff line
@@ -25,10 +25,12 @@ 
#include "at91_rstc.h"

#include "soc.h"

#include "generic.h"

#include "clock.h"

#include "sam9_smc.h"

#include "pm.h"



#if defined(CONFIG_OLD_CLK_AT91)

#include "clock.h"



/* --------------------------------------------------------------------

 *  Clocks

 * -------------------------------------------------------------------- */
@@ -264,7 +266,9 @@ static void __init at91sam9261_register_clocks(void) 
	clk_register(&hck0);

	clk_register(&hck1);

}



#else

#define at91sam9261_register_clocks NULL

#endif

/* --------------------------------------------------------------------

 *  GPIO

 * -------------------------------------------------------------------- */