diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-06-21 09:56:30 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 14:30:18 -0400 |
commit | c83cfc9c9477d0bc0e0a1ba29dfc58e0d42b2faf (patch) | |
tree | 86c613b44ae25af1808b81dde2a4dc0274647194 /arch/mips/gt64120 | |
parent | 8c93650890a33318263880dec36603a6d5749b7e (diff) |
Get rid of early_init. There's more need to make this form of
initialization actually useful and as is certainly unmergable with
upstream.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/gt64120')
-rw-r--r-- | arch/mips/gt64120/ev64120/setup.c | 4 | ||||
-rw-r--r-- | arch/mips/gt64120/momenco_ocelot/setup.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/mips/gt64120/ev64120/setup.c b/arch/mips/gt64120/ev64120/setup.c index dba0961400cc..98b5a96cc039 100644 --- a/arch/mips/gt64120/ev64120/setup.c +++ b/arch/mips/gt64120/ev64120/setup.c | |||
@@ -69,7 +69,7 @@ unsigned long __init prom_free_prom_memory(void) | |||
69 | */ | 69 | */ |
70 | extern void gt64120_time_init(void); | 70 | extern void gt64120_time_init(void); |
71 | 71 | ||
72 | static void __init ev64120_setup(void) | 72 | void __init plat_setup(void) |
73 | { | 73 | { |
74 | _machine_restart = galileo_machine_restart; | 74 | _machine_restart = galileo_machine_restart; |
75 | _machine_halt = galileo_machine_halt; | 75 | _machine_halt = galileo_machine_halt; |
@@ -79,8 +79,6 @@ static void __init ev64120_setup(void) | |||
79 | set_io_port_base(KSEG1); | 79 | set_io_port_base(KSEG1); |
80 | } | 80 | } |
81 | 81 | ||
82 | early_initcall(ev64120_setup); | ||
83 | |||
84 | const char *get_system_type(void) | 82 | const char *get_system_type(void) |
85 | { | 83 | { |
86 | return "Galileo EV64120A"; | 84 | return "Galileo EV64120A"; |
diff --git a/arch/mips/gt64120/momenco_ocelot/setup.c b/arch/mips/gt64120/momenco_ocelot/setup.c index d610f8c17c81..0d07c33112d0 100644 --- a/arch/mips/gt64120/momenco_ocelot/setup.c +++ b/arch/mips/gt64120/momenco_ocelot/setup.c | |||
@@ -150,7 +150,7 @@ void PMON_v2_setup() | |||
150 | gt64120_base = 0xe0000000; | 150 | gt64120_base = 0xe0000000; |
151 | } | 151 | } |
152 | 152 | ||
153 | static void __init momenco_ocelot_setup(void) | 153 | void __init plat_setup(void) |
154 | { | 154 | { |
155 | void (*l3func)(unsigned long)=KSEG1ADDR(&setup_l3cache); | 155 | void (*l3func)(unsigned long)=KSEG1ADDR(&setup_l3cache); |
156 | unsigned int tmpword; | 156 | unsigned int tmpword; |
@@ -307,8 +307,6 @@ static void __init momenco_ocelot_setup(void) | |||
307 | GT_WRITE(GT_DEV_B3_OFS, 0xfef73); | 307 | GT_WRITE(GT_DEV_B3_OFS, 0xfef73); |
308 | } | 308 | } |
309 | 309 | ||
310 | early_initcall(momenco_ocelot_setup); | ||
311 | |||
312 | extern int rm7k_tcache_enabled; | 310 | extern int rm7k_tcache_enabled; |
313 | /* | 311 | /* |
314 | * This runs in KSEG1. See the verbiage in rm7k.c::probe_scache() | 312 | * This runs in KSEG1. See the verbiage in rm7k.c::probe_scache() |