vserver 2.0 rc7

[linux-2.6.git] / arch / mips / vr41xx / common / init.c

diff --git a/arch/mips/vr41xx/common/init.c b/arch/mips/vr41xx/common/init.c
index ffc8e1c..e03be89 100644 (file)
--- a/arch/mips/vr41xx/common/init.c
+++ b/arch/mips/vr41xx/common/init.c
@@ -1,7 +1,7 @@
 /*
  *  init.c, Common initialization routines for NEC VR4100 series.
  *
- *  Copyright (C) 2003-2004  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
+ *  Copyright (C) 2003-2005  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,9 +18,45 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/irq.h>
 #include <linux/string.h>
 
 #include <asm/bootinfo.h>
+#include <asm/time.h>
+#include <asm/vr41xx/vr41xx.h>
+
+#define IO_MEM_RESOURCE_START  0UL
+#define IO_MEM_RESOURCE_END    0x1fffffffUL
+
+static void __init iomem_resource_init(void)
+{
+       iomem_resource.start = IO_MEM_RESOURCE_START;
+       iomem_resource.end = IO_MEM_RESOURCE_END;
+}
+
+static void __init setup_timer_frequency(void)
+{
+       unsigned long tclock;
+
+       tclock = vr41xx_get_tclock_frequency();
+       if (current_cpu_data.processor_id == PRID_VR4131_REV2_0 ||
+           current_cpu_data.processor_id == PRID_VR4131_REV2_1)
+               mips_hpt_frequency = tclock / 2;
+       else
+               mips_hpt_frequency = tclock / 4;
+}
+
+static void __init setup_timer_irq(struct irqaction *irq)
+{
+       setup_irq(TIMER_IRQ, irq);
+}
+
+static void __init timer_init(void)
+{
+       board_time_init = setup_timer_frequency;
+       board_timer_setup = setup_timer_irq;
+}
 
 void __init prom_init(void)
 {
@@ -35,6 +71,12 @@ void __init prom_init(void)
                if (i < (argc - 1))
                        strcat(arcs_cmdline, " ");
        }
+
+       vr41xx_calculate_clock_frequency();
+
+       timer_init();
+
+       iomem_resource_init();
 }
 
 unsigned long __init prom_free_prom_memory (void)