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_c
/
setup.c
diff --git
a/arch/mips/momentum/ocelot_c/setup.c
b/arch/mips/momentum/ocelot_c/setup.c
index
a3e6f55
..
0b6b233
100644
(file)
--- a/
arch/mips/momentum/ocelot_c/setup.c
+++ b/
arch/mips/momentum/ocelot_c/setup.c
@@
-40,7
+40,6
@@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
-#include <linux/config.h>
#include <linux/bcd.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/bcd.h>
#include <linux/init.h>
#include <linux/kernel.h>
@@
-63,7
+62,6
@@
#include <asm/irq.h>
#include <asm/pci.h>
#include <asm/processor.h>
#include <asm/irq.h>
#include <asm/pci.h>
#include <asm/processor.h>
-#include <asm/ptrace.h>
#include <asm/reboot.h>
#include <asm/marvell.h>
#include <linux/bootmem.h>
#include <asm/reboot.h>
#include <asm/marvell.h>
#include <linux/bootmem.h>
@@
-71,8
+69,7
@@
#include "ocelot_c_fpga.h"
unsigned long marvell_base;
#include "ocelot_c_fpga.h"
unsigned long marvell_base;
-extern unsigned long mv64340_sram_base;
-unsigned long cpu_clock;
+unsigned int cpu_clock;
/* These functions are used for rebooting or halting the machine*/
extern void momenco_ocelot_restart(char *command);
/* These functions are used for rebooting or halting the machine*/
extern void momenco_ocelot_restart(char *command);
@@
-121,7
+118,6
@@
void PMON_v2_setup(void)
add_wired_entry(ENTRYLO(0xfe000000), ENTRYLO(0xff000000), 0xfffffffffe000000, PM_16M);
marvell_base = 0xfffffffff4000000;
add_wired_entry(ENTRYLO(0xfe000000), ENTRYLO(0xff000000), 0xfffffffffe000000, PM_16M);
marvell_base = 0xfffffffff4000000;
- mv64340_sram_base = 0xfffffffffe000000;
#else
/* marvell and extra space */
add_wired_entry(ENTRYLO(0xf4000000), ENTRYLO(0xf4010000), 0xf4000000, PM_64K);
#else
/* marvell and extra space */
add_wired_entry(ENTRYLO(0xf4000000), ENTRYLO(0xf4010000), 0xf4000000, PM_64K);
@@
-131,7
+127,6
@@
void PMON_v2_setup(void)
add_wired_entry(ENTRYLO(0xfe000000), ENTRYLO(0xff000000), 0xfe000000, PM_16M);
marvell_base = 0xf4000000;
add_wired_entry(ENTRYLO(0xfe000000), ENTRYLO(0xff000000), 0xfe000000, PM_16M);
marvell_base = 0xf4000000;
- mv64340_sram_base = 0xfe000000;
#endif
}
#endif
}
@@
-210,7
+205,7
@@
int m48t37y_set_time(unsigned long sec)
return 0;
}
return 0;
}
-void
momenco
_timer_setup(struct irqaction *irq)
+void
__init plat
_timer_setup(struct irqaction *irq)
{
setup_irq(7, irq);
}
{
setup_irq(7, irq);
}
@@
-225,13
+220,12
@@
void momenco_time_init(void)
#error Unknown CPU for this board
#endif
printk("momenco_time_init cpu_clock=%d\n", cpu_clock);
#error Unknown CPU for this board
#endif
printk("momenco_time_init cpu_clock=%d\n", cpu_clock);
- board_timer_setup = momenco_timer_setup;
rtc_mips_get_time = m48t37y_get_time;
rtc_mips_set_time = m48t37y_set_time;
}
rtc_mips_get_time = m48t37y_get_time;
rtc_mips_set_time = m48t37y_set_time;
}
-void __init plat_setup(void)
+void __init plat_
mem_
setup(void)
{
unsigned int tmpword;
{
unsigned int tmpword;
@@
-242,8
+236,8
@@
void __init plat_setup(void)
pm_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;
*/
* initrd_below_start_ok = 1;
*/
@@
-349,22
+343,20
@@
void __init plat_setup(void)
}
}
}
}
-#ifndef CONFIG_64BIT
-/* 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
+ */
static int io_base_ioremap(void)
{
static int io_base_ioremap(void)
{
- /* we're mapping PCI accesses from 0xc0000000 to 0xf0000000 */
- void *io_remap_range = ioremap(0xc0000000, 0x30000000);
+ void __iomem * io_remap_range = ioremap(0xc0000000UL, 0x10000);
- if (!io_remap_range)
{
+ if (!io_remap_range)
panic("Could not ioremap I/O port range");
panic("Could not ioremap I/O port range");
- }
- printk("io_remap_range set at 0x%08x\n", (uint32_t)io_remap_range);
- set_io_port_base(io_remap_range - 0xc0000000);
+
+ set_io_port_base((unsigned long) io_remap_range);
return 0;
}
module_init(io_base_ioremap);
return 0;
}
module_init(io_base_ioremap);
-#endif