aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2009-09-15 09:00:02 -0400
committerRalf Baechle <ralf@linux-mips.org>2009-09-17 14:07:43 -0400
commit38c9fb743f0d6e9dd8ee45e3e6247bc7d147c4de (patch)
treea389f9079cc3f2f4d98eba1a638d44236af47266 /arch
parent1f320d053c666567a8e440ebcec4ed7f7006b006 (diff)
MIPS: Fulong: Convert reset initialization to initcall.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/include/asm/mips-boards/generic.h2
-rw-r--r--arch/mips/lemote/lm2e/reset.c7
-rw-r--r--arch/mips/lemote/lm2e/setup.c3
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/include/asm/mips-boards/generic.h b/arch/mips/include/asm/mips-boards/generic.h
index c0da1a881e3d..46c08563e532 100644
--- a/arch/mips/include/asm/mips-boards/generic.h
+++ b/arch/mips/include/asm/mips-boards/generic.h
@@ -87,8 +87,6 @@
87 87
88extern int mips_revision_sconid; 88extern int mips_revision_sconid;
89 89
90extern void mips_reboot_setup(void);
91
92#ifdef CONFIG_PCI 90#ifdef CONFIG_PCI
93extern void mips_pcibios_init(void); 91extern void mips_pcibios_init(void);
94#else 92#else
diff --git a/arch/mips/lemote/lm2e/reset.c b/arch/mips/lemote/lm2e/reset.c
index 099387a3827a..2e64bf6929e7 100644
--- a/arch/mips/lemote/lm2e/reset.c
+++ b/arch/mips/lemote/lm2e/reset.c
@@ -7,6 +7,7 @@
7 * Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology 7 * Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology
8 * Author: Fuxin Zhang, zhangfx@lemote.com 8 * Author: Fuxin Zhang, zhangfx@lemote.com
9 */ 9 */
10#include <linux/init.h>
10#include <linux/pm.h> 11#include <linux/pm.h>
11 12
12#include <asm/reboot.h> 13#include <asm/reboot.h>
@@ -33,9 +34,13 @@ static void loongson2e_power_off(void)
33 loongson2e_halt(); 34 loongson2e_halt();
34} 35}
35 36
36void mips_reboot_setup(void) 37static int __init mips_reboot_setup(void)
37{ 38{
38 _machine_restart = loongson2e_restart; 39 _machine_restart = loongson2e_restart;
39 _machine_halt = loongson2e_halt; 40 _machine_halt = loongson2e_halt;
40 pm_power_off = loongson2e_power_off; 41 pm_power_off = loongson2e_power_off;
42
43 return 0;
41} 44}
45
46arch_initcall(mips_reboot_setup);
diff --git a/arch/mips/lemote/lm2e/setup.c b/arch/mips/lemote/lm2e/setup.c
index ebd6ceaef2fd..79dae630611a 100644
--- a/arch/mips/lemote/lm2e/setup.c
+++ b/arch/mips/lemote/lm2e/setup.c
@@ -41,8 +41,6 @@
41#include <linux/screen_info.h> 41#include <linux/screen_info.h>
42#endif 42#endif
43 43
44extern void mips_reboot_setup(void);
45
46unsigned long cpu_clock_freq; 44unsigned long cpu_clock_freq;
47unsigned long bus_clock; 45unsigned long bus_clock;
48unsigned int memsize; 46unsigned int memsize;
@@ -77,7 +75,6 @@ void __init plat_mem_setup(void)
77{ 75{
78 set_io_port_base((unsigned long)ioremap(LOONGSON2E_IO_PORT_BASE, 76 set_io_port_base((unsigned long)ioremap(LOONGSON2E_IO_PORT_BASE,
79 IO_SPACE_LIMIT - LOONGSON2E_PCI_IO_START + 1)); 77 IO_SPACE_LIMIT - LOONGSON2E_PCI_IO_START + 1));
80 mips_reboot_setup();
81 78
82 __wbflush = wbflush_loongson2e; 79 __wbflush = wbflush_loongson2e;
83 80