diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-09-02 12:02:26 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-09-03 04:55:42 -0400 |
commit | bc1aeaeb75f169f870573f6d4e517f925269de4a (patch) | |
tree | 0af98d46169531dbbcfc71f0ffadac8de787142b | |
parent | f807a89cfe3e7379ec501810d67a5888edbb94f1 (diff) |
ARM: at91: dt: Remove init_time definitions
The current AT91 DT boards have a completely generic init_time definition.
Remove them from the machine declaration.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Conflicts:
arch/arm/mach-at91/board-dt-sam9.c
arch/arm/mach-at91/board-dt-sama5.c
-rw-r--r-- | arch/arm/mach-at91/board-dt-sam9.c | 11 | ||||
-rw-r--r-- | arch/arm/mach-at91/board-dt-sama5.c | 10 |
2 files changed, 0 insertions, 21 deletions
diff --git a/arch/arm/mach-at91/board-dt-sam9.c b/arch/arm/mach-at91/board-dt-sam9.c index 78962fd23859..d3048ccdc41f 100644 --- a/arch/arm/mach-at91/board-dt-sam9.c +++ b/arch/arm/mach-at91/board-dt-sam9.c | |||
@@ -14,7 +14,6 @@ | |||
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 | #include <linux/clk-provider.h> |
17 | #include <linux/clocksource.h> | ||
18 | 17 | ||
19 | #include <asm/setup.h> | 18 | #include <asm/setup.h> |
20 | #include <asm/irq.h> | 19 | #include <asm/irq.h> |
@@ -26,15 +25,6 @@ | |||
26 | #include "board.h" | 25 | #include "board.h" |
27 | #include "generic.h" | 26 | #include "generic.h" |
28 | 27 | ||
29 | |||
30 | static void __init sam9_dt_timer_init(void) | ||
31 | { | ||
32 | #if defined(CONFIG_COMMON_CLK) | ||
33 | of_clk_init(NULL); | ||
34 | #endif | ||
35 | clocksource_of_init(); | ||
36 | } | ||
37 | |||
38 | static const char *at91_dt_board_compat[] __initdata = { | 28 | static const char *at91_dt_board_compat[] __initdata = { |
39 | "atmel,at91sam9", | 29 | "atmel,at91sam9", |
40 | NULL | 30 | NULL |
@@ -42,7 +32,6 @@ static const char *at91_dt_board_compat[] __initdata = { | |||
42 | 32 | ||
43 | DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM (Device Tree)") | 33 | DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM (Device Tree)") |
44 | /* Maintainer: Atmel */ | 34 | /* Maintainer: Atmel */ |
45 | .init_time = sam9_dt_timer_init, | ||
46 | .map_io = at91_map_io, | 35 | .map_io = at91_map_io, |
47 | .init_early = at91_dt_initialize, | 36 | .init_early = at91_dt_initialize, |
48 | .dt_compat = at91_dt_board_compat, | 37 | .dt_compat = at91_dt_board_compat, |
diff --git a/arch/arm/mach-at91/board-dt-sama5.c b/arch/arm/mach-at91/board-dt-sama5.c index 4f01e34fae0a..be6aa2e2c343 100644 --- a/arch/arm/mach-at91/board-dt-sama5.c +++ b/arch/arm/mach-at91/board-dt-sama5.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/of_platform.h> | 17 | #include <linux/of_platform.h> |
18 | #include <linux/phy.h> | 18 | #include <linux/phy.h> |
19 | #include <linux/clk-provider.h> | 19 | #include <linux/clk-provider.h> |
20 | #include <linux/clocksource.h> | ||
21 | 20 | ||
22 | #include <asm/setup.h> | 21 | #include <asm/setup.h> |
23 | #include <asm/irq.h> | 22 | #include <asm/irq.h> |
@@ -28,14 +27,6 @@ | |||
28 | #include "at91_aic.h" | 27 | #include "at91_aic.h" |
29 | #include "generic.h" | 28 | #include "generic.h" |
30 | 29 | ||
31 | static void __init sama5_dt_timer_init(void) | ||
32 | { | ||
33 | #if defined(CONFIG_COMMON_CLK) | ||
34 | of_clk_init(NULL); | ||
35 | #endif | ||
36 | clocksource_of_init(); | ||
37 | } | ||
38 | |||
39 | static int ksz9021rn_phy_fixup(struct phy_device *phy) | 30 | static int ksz9021rn_phy_fixup(struct phy_device *phy) |
40 | { | 31 | { |
41 | int value; | 32 | int value; |
@@ -70,7 +61,6 @@ static const char *sama5_dt_board_compat[] __initdata = { | |||
70 | 61 | ||
71 | DT_MACHINE_START(sama5_dt, "Atmel SAMA5 (Device Tree)") | 62 | DT_MACHINE_START(sama5_dt, "Atmel SAMA5 (Device Tree)") |
72 | /* Maintainer: Atmel */ | 63 | /* Maintainer: Atmel */ |
73 | .init_time = sama5_dt_timer_init, | ||
74 | .map_io = at91_map_io, | 64 | .map_io = at91_map_io, |
75 | .init_early = at91_dt_initialize, | 65 | .init_early = at91_dt_initialize, |
76 | .init_machine = sama5_dt_device_init, | 66 | .init_machine = sama5_dt_device_init, |