vserver 1.9.5.x5

[linux-2.6.git] / arch / ppc / platforms / 85xx / sbc85xx.c

diff --git a/arch/ppc/platforms/85xx/sbc85xx.c b/arch/ppc/platforms/85xx/sbc85xx.c
index a7a33fd..ddcca0d 100644 (file)
--- a/arch/ppc/platforms/85xx/sbc85xx.c
+++ b/arch/ppc/platforms/85xx/sbc85xx.c
@@ -42,7 +42,6 @@
 #include <asm/mpc85xx.h>
 #include <asm/irq.h>
 #include <asm/immap_85xx.h>
-#include <asm/ocp.h>
 
 #include <mm/mmu_decl.h>
 
@@ -61,38 +60,38 @@ extern unsigned long total_memory;  /* in mm/init */
 /* Internal interrupts are all Level Sensitive, and Positive Polarity */
 
 static u_char sbc8560_openpic_initsenses[] __initdata = {
-       (IRQ_POLARITY_POSITIVE),        /* Internal  0: L2 Cache */
-       (IRQ_POLARITY_POSITIVE),        /* Internal  1: ECM */
-       (IRQ_POLARITY_POSITIVE),        /* Internal  2: DDR DRAM */
-       (IRQ_POLARITY_POSITIVE),        /* Internal  3: LBIU */
-       (IRQ_POLARITY_POSITIVE),        /* Internal  4: DMA 0 */
-       (IRQ_POLARITY_POSITIVE),        /* Internal  5: DMA 1 */
-       (IRQ_POLARITY_POSITIVE),        /* Internal  6: DMA 2 */
-       (IRQ_POLARITY_POSITIVE),        /* Internal  7: DMA 3 */
-       (IRQ_POLARITY_POSITIVE),        /* Internal  8: PCI/PCI-X */
-       (IRQ_POLARITY_POSITIVE),        /* Internal  9: RIO Inbound Port Write Error */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 10: RIO Doorbell Inbound */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 11: RIO Outbound Message */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 12: RIO Inbound Message */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 13: TSEC 0 Transmit */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 14: TSEC 0 Receive */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 15: Unused */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 16: Unused */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 17: Unused */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 18: TSEC 0 Receive/Transmit Error */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 19: TSEC 1 Transmit */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 20: TSEC 1 Receive */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 21: Unused */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 22: Unused */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 23: Unused */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 24: TSEC 1 Receive/Transmit Error */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 25: Fast Ethernet */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 26: DUART */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 27: I2C */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 28: Performance Monitor */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 29: Unused */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 30: CPM */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 31: Unused */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  0: L2 Cache */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  1: ECM */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  2: DDR DRAM */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  3: LBIU */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  4: DMA 0 */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  5: DMA 1 */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  6: DMA 2 */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  7: DMA 3 */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  8: PCI/PCI-X */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  9: RIO Inbound Port Write Error */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 10: RIO Doorbell Inbound */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 11: RIO Outbound Message */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 12: RIO Inbound Message */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 13: TSEC 0 Transmit */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 14: TSEC 0 Receive */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 15: Unused */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 16: Unused */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 17: Unused */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 18: TSEC 0 Receive/Transmit Error */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 19: TSEC 1 Transmit */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 20: TSEC 1 Receive */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 21: Unused */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 22: Unused */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 23: Unused */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 24: TSEC 1 Receive/Transmit Error */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 25: Fast Ethernet */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 26: DUART */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 27: I2C */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 28: Performance Monitor */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 29: Unused */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 30: CPM */
+       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 31: Unused */
        0x0,                            /* External  0: */
        0x0,                            /* External  1: */
 #if defined(CONFIG_PCI)
@@ -142,8 +141,7 @@ sbc8560_show_cpuinfo(struct seq_file *m)
                seq_printf(m, "Machine\t\t: unknown\n");
                break;
        }
-       seq_printf(m, "bus freq\t: %u.%.6u MHz\n", freq / 1000000,
-                  freq % 1000000);
+       seq_printf(m, "clock\t\t: %dMHz\n", freq / 1000000);
        seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
        seq_printf(m, "SVR\t\t: 0x%x\n", svid);