diff options
| author | Jean-Jacques Hiblot | 2014-03-03 11:06:01 +0100 |
|---|---|---|
| committer | Nicolas Ferre | 2014-03-12 14:36:15 +0100 |
| commit | 02c5777921fdb9bfd08da1d0e8150a785cf9003a (patch) | |
| tree | 4d35c07d847a7f76becbe91a26ca8f71d0a8f46b /arch/arm/mach-at91 | |
| parent | ARM: at91: updated the at91_dt_defconfig with support for the ADS7846 (diff) | |
| download | kernel-qcow2-linux-02c5777921fdb9bfd08da1d0e8150a785cf9003a.tar.gz kernel-qcow2-linux-02c5777921fdb9bfd08da1d0e8150a785cf9003a.tar.xz kernel-qcow2-linux-02c5777921fdb9bfd08da1d0e8150a785cf9003a.zip | |
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>
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9261.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index 5c9058135e64..3345a2b31015 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c @@ -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 * -------------------------------------------------------------------- */ |