diff options
Diffstat (limited to 'arch/arm/mach-at91/board-dt-sam9.c')
-rw-r--r-- | arch/arm/mach-at91/board-dt-sam9.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-dt-sam9.c b/arch/arm/mach-at91/board-dt-sam9.c index 3dab868b02fa..575b0be66ca8 100644 --- a/arch/arm/mach-at91/board-dt-sam9.c +++ b/arch/arm/mach-at91/board-dt-sam9.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/gpio.h> | 13 | #include <linux/gpio.h> |
14 | #include <linux/of.h> | 14 | #include <linux/of.h> |
15 | #include <linux/of_irq.h> | 15 | #include <linux/of_irq.h> |
16 | #include <linux/clk-provider.h> | ||
16 | 17 | ||
17 | #include <asm/setup.h> | 18 | #include <asm/setup.h> |
18 | #include <asm/irq.h> | 19 | #include <asm/irq.h> |
@@ -25,6 +26,14 @@ | |||
25 | #include "generic.h" | 26 | #include "generic.h" |
26 | 27 | ||
27 | 28 | ||
29 | static void __init sam9_dt_timer_init(void) | ||
30 | { | ||
31 | #if defined(CONFIG_COMMON_CLK) | ||
32 | of_clk_init(NULL); | ||
33 | #endif | ||
34 | at91sam926x_pit_init(); | ||
35 | } | ||
36 | |||
28 | static const struct of_device_id irq_of_match[] __initconst = { | 37 | static const struct of_device_id irq_of_match[] __initconst = { |
29 | 38 | ||
30 | { .compatible = "atmel,at91rm9200-aic", .data = at91_aic_of_init }, | 39 | { .compatible = "atmel,at91rm9200-aic", .data = at91_aic_of_init }, |
@@ -43,7 +52,7 @@ static const char *at91_dt_board_compat[] __initdata = { | |||
43 | 52 | ||
44 | DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM (Device Tree)") | 53 | DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM (Device Tree)") |
45 | /* Maintainer: Atmel */ | 54 | /* Maintainer: Atmel */ |
46 | .init_time = at91sam926x_pit_init, | 55 | .init_time = sam9_dt_timer_init, |
47 | .map_io = at91_map_io, | 56 | .map_io = at91_map_io, |
48 | .handle_irq = at91_aic_handle_irq, | 57 | .handle_irq = at91_aic_handle_irq, |
49 | .init_early = at91_dt_initialize, | 58 | .init_early = at91_dt_initialize, |