UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Jean-Jacques Hiblot <jjhiblot@traphandler.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
This commit is contained in:
Jean-Jacques Hiblot 2014-03-03 11:06:01 +01:00 committed by Nicolas Ferre
parent b646b9cf5b
commit 02c5777921
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-at91/at91sam9261.c
View File

@ -25,10 +25,12 @@
#include "at91_rstc.h" #include "at91_rstc.h"
#include "soc.h" #include "soc.h"
#include "generic.h" #include "generic.h"
#include "clock.h"
#include "sam9_smc.h" #include "sam9_smc.h"
#include "pm.h" #include "pm.h"
#if defined(CONFIG_OLD_CLK_AT91)
#include "clock.h"
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------
* Clocks * Clocks
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
@ -264,7 +266,9 @@ static void __init at91sam9261_register_clocks(void)
clk_register(&hck0); clk_register(&hck0);
clk_register(&hck1); clk_register(&hck1);
} }
#else
#define at91sam9261_register_clocks NULL
#endif
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------
* GPIO * GPIO
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */