projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[POWERPC] Better check in show_instructions
[powerpc.git]
/
arch
/
mips
/
cobalt
/
setup.c
diff --git
a/arch/mips/cobalt/setup.c
b/arch/mips/cobalt/setup.c
index
ca719d6
..
bf9dc72
100644
(file)
--- a/
arch/mips/cobalt/setup.c
+++ b/
arch/mips/cobalt/setup.c
@@
-9,7
+9,6
@@
* Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv)
*
*/
* Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv)
*
*/
-#include <linux/config.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/init.h>
@@
-24,7
+23,6
@@
#include <asm/processor.h>
#include <asm/reboot.h>
#include <asm/gt64120.h>
#include <asm/processor.h>
#include <asm/reboot.h>
#include <asm/gt64120.h>
-#include <asm/serial.h>
#include <asm/mach-cobalt/cobalt.h>
#include <asm/mach-cobalt/cobalt.h>
@@
-50,10
+48,10
@@
const char *get_system_type(void)
return "MIPS Cobalt";
}
return "MIPS Cobalt";
}
-
static void __init cobal
t_timer_setup(struct irqaction *irq)
+
void __init pla
t_timer_setup(struct irqaction *irq)
{
{
- /* Load timer value for
1KHz
(TCLK is 50MHz) */
- GALILEO_OUTL(50*1000*1000 /
1000
, GT_TC0_OFS);
+ /* Load timer value for
HZ
(TCLK is 50MHz) */
+ GALILEO_OUTL(50*1000*1000 /
HZ
, GT_TC0_OFS);
/* Enable timer */
GALILEO_OUTL(GALILEO_ENTC0 | GALILEO_SELTC0, GT_TC_CONTROL_OFS);
/* Enable timer */
GALILEO_OUTL(GALILEO_ENTC0 | GALILEO_SELTC0, GT_TC_CONTROL_OFS);
@@
-130,8
+128,6
@@
void __init plat_mem_setup(void)
_machine_halt = cobalt_machine_halt;
pm_power_off = cobalt_machine_power_off;
_machine_halt = cobalt_machine_halt;
pm_power_off = cobalt_machine_power_off;
- board_timer_setup = cobalt_timer_setup;
-
set_io_port_base(CKSEG1ADDR(GT64111_IO_BASE));
/* I/O port resource must include UART and LCD/buttons */
set_io_port_base(CKSEG1ADDR(GT64111_IO_BASE));
/* I/O port resource must include UART and LCD/buttons */