Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / ppc / platforms / gemini_setup.c

diff --git a/arch/ppc/platforms/gemini_setup.c b/arch/ppc/platforms/gemini_setup.c
index 2576d85..0090ff1 100644 (file)
--- a/arch/ppc/platforms/gemini_setup.c
+++ b/arch/ppc/platforms/gemini_setup.c
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/platforms/gemini_setup.c
- *
  *  Copyright (C) 1995 Linus Torvalds
  *  Adapted from 'alpha' version by Gary Thomas
  *  Modified by Cort Dougan (cort@cs.nmt.edu)
@@ -21,7 +19,6 @@
 #include <linux/major.h>
 #include <linux/initrd.h>
 #include <linux/console.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/bcd.h>
@@ -36,6 +33,7 @@
 #include <asm/time.h>
 #include <asm/open_pic.h>
 #include <asm/bootinfo.h>
+#include <asm/machdep.h>
 
 void gemini_find_bridges(void);
 static int gemini_get_clock_speed(void);
@@ -202,8 +200,8 @@ gemini_get_clock_speed(void)
        unsigned long hid1, pvr;
        int clock;
 
-       pvr = mfspr(PVR);
-       hid1 = (mfspr(HID1) >> 28) & 0xf;
+       pvr = mfspr(SPRN_PVR);
+       hid1 = (mfspr(SPRN_HID1) >> 28) & 0xf;
        if (PVR_VER(pvr) == 8 ||
            PVR_VER(pvr) == 12)
                hid1 = cpu_7xx[hid1];
@@ -238,7 +236,7 @@ void __init gemini_init_l2(void)
         reg = readb(GEMINI_L2CFG);
         brev = readb(GEMINI_BREV);
         fam = readb(GEMINI_FEAT);
-        pvr = mfspr(PVR);
+        pvr = mfspr(SPRN_PVR);
 
         switch(PVR_VER(pvr)) {
 
@@ -433,9 +431,6 @@ gemini_set_rtc_time( unsigned long now )
        /* done writing */
        gemini_rtc_write(reg, M48T35_RTC_CONTROL);
 
-       if ((time_state == TIME_ERROR) || (time_state == TIME_BAD))
-               time_state = TIME_OK;
-
        return 0;
 }
 
@@ -537,8 +532,8 @@ void __init platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
        int i;
 
        /* Restore BATs for now */
-       mtspr(DBAT3U, 0xf0001fff);
-       mtspr(DBAT3L, 0xf000002a);
+       mtspr(SPRN_DBAT3U, 0xf0001fff);
+       mtspr(SPRN_DBAT3L, 0xf000002a);
 
        parse_bootinfo(find_bootinfo());
 
@@ -559,7 +554,6 @@ void __init platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 
        ppc_md.setup_arch = gemini_setup_arch;
        ppc_md.show_cpuinfo = gemini_show_cpuinfo;
-       ppc_md.irq_canonicalize = NULL;
        ppc_md.init_IRQ = gemini_init_IRQ;
        ppc_md.get_irq = openpic_get_irq;
        ppc_md.init = NULL;
@@ -579,6 +573,6 @@ void __init platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
        ppc_md.pcibios_fixup_bus = gemini_pcibios_fixup;
 
 #ifdef CONFIG_SMP
-       ppc_md.smp_ops = &gemini_smp_ops;
+       smp_ops = &gemini_smp_ops;
 #endif /* CONFIG_SMP */
 }