aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2015-01-12 13:42:15 -0500
committerNicolas Ferre <nicolas.ferre@atmel.com>2015-01-15 09:24:06 -0500
commit427accd3c43aee11c59b4c2d6e8328a0337017fc (patch)
tree2870bd0506dde5e0fe1d84a1c87803b072ce36d4 /arch/arm/mach-at91
parent5f58c97099f20cb12b463d3bb8bf0cbe522deb22 (diff)
ARM: at91: remove useless at91rm9200_dt_initialize()
at91rm9200_dt_initialize() is doing the same as at91_dt_initialize(), use that one instead. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@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/board-dt-rm9200.c2
-rw-r--r--arch/arm/mach-at91/generic.h1
-rw-r--r--arch/arm/mach-at91/setup.c7
3 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/mach-at91/board-dt-rm9200.c b/arch/arm/mach-at91/board-dt-rm9200.c
index 76dfe8f9af50..a15ab6f8de00 100644
--- a/arch/arm/mach-at91/board-dt-rm9200.c
+++ b/arch/arm/mach-at91/board-dt-rm9200.c
@@ -38,6 +38,6 @@ static const char *at91rm9200_dt_board_compat[] __initdata = {
38DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)") 38DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)")
39 .init_time = at91rm9200_dt_timer_init, 39 .init_time = at91rm9200_dt_timer_init,
40 .map_io = at91_map_io, 40 .map_io = at91_map_io,
41 .init_early = at91rm9200_dt_initialize, 41 .init_early = at91_dt_initialize,
42 .dt_compat = at91rm9200_dt_board_compat, 42 .dt_compat = at91rm9200_dt_board_compat,
43MACHINE_END 43MACHINE_END
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
index e0368aa06390..c10c2ddaae6d 100644
--- a/arch/arm/mach-at91/generic.h
+++ b/arch/arm/mach-at91/generic.h
@@ -22,7 +22,6 @@ extern void __init at91_init_sram(int bank, unsigned long base,
22 22
23 /* Processors */ 23 /* Processors */
24extern void __init at91rm9200_set_type(int type); 24extern void __init at91rm9200_set_type(int type);
25extern void __init at91rm9200_dt_initialize(void);
26extern void __init at91_dt_initialize(void); 25extern void __init at91_dt_initialize(void);
27 26
28 /* Timer */ 27 /* Timer */
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index ce25e85720fb..acb8d7724609 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -429,13 +429,6 @@ static void at91_dt_ramc(void)
429 at91_pm_set_standby(standby); 429 at91_pm_set_standby(standby);
430} 430}
431 431
432void __init at91rm9200_dt_initialize(void)
433{
434 at91_dt_ramc();
435
436 at91_boot_soc.init();
437}
438
439void __init at91_dt_initialize(void) 432void __init at91_dt_initialize(void)
440{ 433{
441 at91_dt_ramc(); 434 at91_dt_ramc();