git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
mips
/
momentum
/
ocelot_g
/
setup.c
diff --git
a/arch/mips/momentum/ocelot_g/setup.c
b/arch/mips/momentum/ocelot_g/setup.c
index
38a78ab
..
9db638a
100644
(file)
--- a/
arch/mips/momentum/ocelot_g/setup.c
+++ b/
arch/mips/momentum/ocelot_g/setup.c
@@
-37,7
+37,6
@@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/types.h>
@@
-47,8
+46,10
@@
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
+#include <linux/pm.h>
#include <linux/timex.h>
#include <linux/vmalloc.h>
#include <linux/timex.h>
#include <linux/vmalloc.h>
+
#include <asm/time.h>
#include <asm/bootinfo.h>
#include <asm/page.h>
#include <asm/time.h>
#include <asm/bootinfo.h>
#include <asm/page.h>
@@
-56,14
+57,14
@@
#include <asm/gt64240.h>
#include <asm/irq.h>
#include <asm/pci.h>
#include <asm/gt64240.h>
#include <asm/irq.h>
#include <asm/pci.h>
+#include <asm/pgtable.h>
#include <asm/processor.h>
#include <asm/processor.h>
-#include <asm/ptrace.h>
#include <asm/reboot.h>
#include <linux/bootmem.h>
#include "ocelot_pld.h"
#include <asm/reboot.h>
#include <linux/bootmem.h>
#include "ocelot_pld.h"
-#ifdef CONFIG_GALIL
L
EO_GT64240_ETH
+#ifdef CONFIG_GALILEO_GT64240_ETH
extern unsigned char prom_mac_addr_base[6];
#endif
extern unsigned char prom_mac_addr_base[6];
#endif
@@
-160,7
+161,11
@@
static void __init setup_l3cache(unsigned long size)
printk("Done\n");
}
printk("Done\n");
}
-static int __init momenco_ocelot_g_setup(void)
+void __init plat_timer_setup(struct irqaction *irq)
+{
+}
+
+void __init plat_mem_setup(void)
{
void (*l3func)(unsigned long) = (void *) KSEG1ADDR(setup_l3cache);
unsigned int tmpword;
{
void (*l3func)(unsigned long) = (void *) KSEG1ADDR(setup_l3cache);
unsigned int tmpword;
@@
-169,18
+174,18
@@
static int __init momenco_ocelot_g_setup(void)
_machine_restart = momenco_ocelot_restart;
_machine_halt = momenco_ocelot_halt;
_machine_restart = momenco_ocelot_restart;
_machine_halt = momenco_ocelot_halt;
-
_machine
_power_off = momenco_ocelot_power_off;
+
pm
_power_off = momenco_ocelot_power_off;
/*
/*
- * initrd_start = (ulong)ocelot_initrd_start;
- * initrd_end = (ulong)ocelot_initrd_start + (ulong)ocelot_initrd_size;
+ * initrd_start = (u
nsigned
long)ocelot_initrd_start;
+ * initrd_end = (u
nsigned
long)ocelot_initrd_start + (ulong)ocelot_initrd_size;
* initrd_below_start_ok = 1;
*/
/* do handoff reconfiguration */
PMON_v2_setup();
* initrd_below_start_ok = 1;
*/
/* do handoff reconfiguration */
PMON_v2_setup();
-#ifdef CONFIG_GALIL
L
EO_GT64240_ETH
+#ifdef CONFIG_GALILEO_GT64240_ETH
/* get the mac addr */
memcpy(prom_mac_addr_base, (void*)0xfc807cf2, 6);
#endif
/* get the mac addr */
memcpy(prom_mac_addr_base, (void*)0xfc807cf2, 6);
#endif
@@
-240,12
+245,8
@@
static int __init momenco_ocelot_g_setup(void)
/* FIXME: Fix up the DiskOnChip mapping */
MV_WRITE(0x468, 0xfef73);
/* FIXME: Fix up the DiskOnChip mapping */
MV_WRITE(0x468, 0xfef73);
-
- return 0;
}
}
-early_initcall(momenco_ocelot_g_setup);
-
/* This needs to be one of the first initcalls, because no I/O port access
can work before this */
/* This needs to be one of the first initcalls, because no I/O port access
can work before this */