diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-04-10 14:19:05 -0400 |
---|---|---|
committer | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-07-09 13:05:21 -0400 |
commit | b81ccb3293c0914dbaf331705ff9323e614939c6 (patch) | |
tree | 1835c79cc18d4c3f77512e64f4b7f47efb2e8f37 /arch/arm | |
parent | a0747caccd05740601552ae58942192d8866163f (diff) |
ARM: at91: prepare common clk transition for sam9263
Enclose the sam9263 old clk registration in "#if defined(CONFIG_OLD_CLK_AT91)
#endif"
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-at91/at91sam9263.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index f30290572293..c07465361947 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c | |||
@@ -25,10 +25,11 @@ | |||
25 | #include "at91_rstc.h" | 25 | #include "at91_rstc.h" |
26 | #include "soc.h" | 26 | #include "soc.h" |
27 | #include "generic.h" | 27 | #include "generic.h" |
28 | #include "clock.h" | ||
29 | #include "sam9_smc.h" | 28 | #include "sam9_smc.h" |
30 | #include "pm.h" | 29 | #include "pm.h" |
31 | 30 | ||
31 | #if defined(CONFIG_OLD_CLK_AT91) | ||
32 | #include "clock.h" | ||
32 | /* -------------------------------------------------------------------- | 33 | /* -------------------------------------------------------------------- |
33 | * Clocks | 34 | * Clocks |
34 | * -------------------------------------------------------------------- */ | 35 | * -------------------------------------------------------------------- */ |
@@ -280,6 +281,9 @@ static void __init at91sam9263_register_clocks(void) | |||
280 | clk_register(&pck2); | 281 | clk_register(&pck2); |
281 | clk_register(&pck3); | 282 | clk_register(&pck3); |
282 | } | 283 | } |
284 | #else | ||
285 | #define at91sam9263_register_clocks NULL | ||
286 | #endif | ||
283 | 287 | ||
284 | /* -------------------------------------------------------------------- | 288 | /* -------------------------------------------------------------------- |
285 | * GPIO | 289 | * GPIO |