Commit bc1aeaeb authored by Maxime Ripard's avatar Maxime Ripard Committed by Nicolas Ferre

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: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: default avatarBoris BREZILLON <boris.brezillon@free-electrons.com>
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>

Conflicts:
	arch/arm/mach-at91/board-dt-sam9.c
	arch/arm/mach-at91/board-dt-sama5.c
parent f807a89c
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
#include <linux/clocksource.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -26,15 +25,6 @@ ...@@ -26,15 +25,6 @@
#include "board.h" #include "board.h"
#include "generic.h" #include "generic.h"
static void __init sam9_dt_timer_init(void)
{
#if defined(CONFIG_COMMON_CLK)
of_clk_init(NULL);
#endif
clocksource_of_init();
}
static const char *at91_dt_board_compat[] __initdata = { static const char *at91_dt_board_compat[] __initdata = {
"atmel,at91sam9", "atmel,at91sam9",
NULL NULL
...@@ -42,7 +32,6 @@ static const char *at91_dt_board_compat[] __initdata = { ...@@ -42,7 +32,6 @@ static const char *at91_dt_board_compat[] __initdata = {
DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM (Device Tree)") DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM (Device Tree)")
/* Maintainer: Atmel */ /* Maintainer: Atmel */
.init_time = sam9_dt_timer_init,
.map_io = at91_map_io, .map_io = at91_map_io,
.init_early = at91_dt_initialize, .init_early = at91_dt_initialize,
.dt_compat = at91_dt_board_compat, .dt_compat = at91_dt_board_compat,
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
#include <linux/clocksource.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -28,14 +27,6 @@ ...@@ -28,14 +27,6 @@
#include "at91_aic.h" #include "at91_aic.h"
#include "generic.h" #include "generic.h"
static void __init sama5_dt_timer_init(void)
{
#if defined(CONFIG_COMMON_CLK)
of_clk_init(NULL);
#endif
clocksource_of_init();
}
static int ksz9021rn_phy_fixup(struct phy_device *phy) static int ksz9021rn_phy_fixup(struct phy_device *phy)
{ {
int value; int value;
...@@ -70,7 +61,6 @@ static const char *sama5_dt_board_compat[] __initdata = { ...@@ -70,7 +61,6 @@ static const char *sama5_dt_board_compat[] __initdata = {
DT_MACHINE_START(sama5_dt, "Atmel SAMA5 (Device Tree)") DT_MACHINE_START(sama5_dt, "Atmel SAMA5 (Device Tree)")
/* Maintainer: Atmel */ /* Maintainer: Atmel */
.init_time = sama5_dt_timer_init,
.map_io = at91_map_io, .map_io = at91_map_io,
.init_early = at91_dt_initialize, .init_early = at91_dt_initialize,
.init_machine = sama5_dt_device_init, .init_machine = sama5_dt_device_init,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment