summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2014-04-10 20:19:33 +0200
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2014-07-09 19:05:18 +0200
commit003b45e287faa6304f4d77a3c456e0c024563a51 (patch)
tree091f5f7575251f20bc9d728d1b52f3f4f6cb8a89 /arch/arm/mach-at91
parentARM: at91/dt: kizbox: define main crystal frequency (diff)
downloadlinux-003b45e287faa6304f4d77a3c456e0c024563a51.tar.xz
linux-003b45e287faa6304f4d77a3c456e0c024563a51.zip
ARM: at91: prepare common clk transition for sam9g45
Enclose the sam9g45 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/mach-at91')
-rw-r--r--arch/arm/mach-at91/at91sam9g45.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index 9d3d544ac19c..0d5d85797cd6 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -25,10 +25,11 @@
#include "at91_aic.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
* -------------------------------------------------------------------- */
@@ -331,6 +332,9 @@ static void __init at91sam9g45_register_clocks(void)
clk_register(&pck0);
clk_register(&pck1);
}
+#else
+#define at91sam9g45_register_clocks NULL
+#endif
/* --------------------------------------------------------------------
* GPIO