iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: at91: prepare common clk transition for sam9rl SoCs

Browse Source 
This patch encloses sam9rl old clk registration in
 #if defined(CONFIG_OLD_CLK_AT91)/#endif sections.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <b.brezillon.dev@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
This commit is contained in:
Alexandre Belloni 2014-03-12 10:43:42 +01:00 committed by Nicolas Ferre
parent 2db5a93d21
commit 72a3fe9729
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-at91/at91sam9rl.c
View File

@ -25,13 +25,14 @@
#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"
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------
* Clocks * Clocks
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_OLD_CLK_AT91)
#include "clock.h"
/* /*
* The peripheral clocks. * The peripheral clocks.
@ -255,6 +256,7 @@ static void __init at91sam9rl_register_clocks(void)
clk_register(&pck0); clk_register(&pck0);
clk_register(&pck1); clk_register(&pck1);
} }
#endif
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------
* GPIO * GPIO
@ -367,6 +369,8 @@ AT91_SOC_START(at91sam9rl)
.default_irq_priority = at91sam9rl_default_irq_priority, .default_irq_priority = at91sam9rl_default_irq_priority,
.extern_irq = (1 << AT91SAM9RL_ID_IRQ0), .extern_irq = (1 << AT91SAM9RL_ID_IRQ0),
.ioremap_registers = at91sam9rl_ioremap_registers, .ioremap_registers = at91sam9rl_ioremap_registers,
#if defined(CONFIG_OLD_CLK_AT91)
.register_clocks = at91sam9rl_register_clocks, .register_clocks = at91sam9rl_register_clocks,
#endif
.init = at91sam9rl_initialize, .init = at91sam9rl_initialize,
AT91_SOC_END AT91_SOC_END