diff options
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/dec/int-handler.S | 8 | ||||
-rw-r--r-- | arch/mips/dec/prom/call_o32.S | 2 | ||||
-rw-r--r-- | arch/mips/dec/prom/init.c | 2 | ||||
-rw-r--r-- | arch/mips/dec/prom/memory.c | 2 | ||||
-rw-r--r-- | arch/mips/dec/setup.c | 4 | ||||
-rw-r--r-- | arch/mips/include/asm/dec/ioasic_addrs.h | 2 | ||||
-rw-r--r-- | arch/mips/include/asm/dec/kn01.h | 12 | ||||
-rw-r--r-- | arch/mips/include/asm/dec/kn02ca.h | 2 | ||||
-rw-r--r-- | arch/mips/include/asm/dec/prom.h | 2 |
9 files changed, 18 insertions, 18 deletions
diff --git a/arch/mips/dec/int-handler.S b/arch/mips/dec/int-handler.S index 22afed16ccde..41a2fa1fa12e 100644 --- a/arch/mips/dec/int-handler.S +++ b/arch/mips/dec/int-handler.S | |||
@@ -118,7 +118,7 @@ | |||
118 | * 7 FPU/R4k timer | 118 | * 7 FPU/R4k timer |
119 | * | 119 | * |
120 | * We handle the IRQ according to _our_ priority (see setup.c), | 120 | * We handle the IRQ according to _our_ priority (see setup.c), |
121 | * then we just return. If multiple IRQs are pending then we will | 121 | * then we just return. If multiple IRQs are pending then we will |
122 | * just take another exception, big deal. | 122 | * just take another exception, big deal. |
123 | */ | 123 | */ |
124 | .align 5 | 124 | .align 5 |
@@ -146,7 +146,7 @@ | |||
146 | /* | 146 | /* |
147 | * Find irq with highest priority | 147 | * Find irq with highest priority |
148 | */ | 148 | */ |
149 | PTR_LA t1,cpu_mask_nr_tbl | 149 | PTR_LA t1,cpu_mask_nr_tbl |
150 | 1: lw t2,(t1) | 150 | 1: lw t2,(t1) |
151 | nop | 151 | nop |
152 | and t2,t0 | 152 | and t2,t0 |
@@ -195,7 +195,7 @@ | |||
195 | /* | 195 | /* |
196 | * Find irq with highest priority | 196 | * Find irq with highest priority |
197 | */ | 197 | */ |
198 | PTR_LA t1,asic_mask_nr_tbl | 198 | PTR_LA t1,asic_mask_nr_tbl |
199 | 2: lw t2,(t1) | 199 | 2: lw t2,(t1) |
200 | nop | 200 | nop |
201 | and t2,t0 | 201 | and t2,t0 |
@@ -221,7 +221,7 @@ | |||
221 | FEXPORT(cpu_all_int) # HALT, timers, software junk | 221 | FEXPORT(cpu_all_int) # HALT, timers, software junk |
222 | li a0,DEC_CPU_IRQ_BASE | 222 | li a0,DEC_CPU_IRQ_BASE |
223 | srl t0,CAUSEB_IP | 223 | srl t0,CAUSEB_IP |
224 | li t1,CAUSEF_IP>>CAUSEB_IP # mask | 224 | li t1,CAUSEF_IP>>CAUSEB_IP # mask |
225 | b 1f | 225 | b 1f |
226 | li t2,4 # nr of bits / 2 | 226 | li t2,4 # nr of bits / 2 |
227 | 227 | ||
diff --git a/arch/mips/dec/prom/call_o32.S b/arch/mips/dec/prom/call_o32.S index c0d1522d448f..8c8498159e43 100644 --- a/arch/mips/dec/prom/call_o32.S +++ b/arch/mips/dec/prom/call_o32.S | |||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | /* Maximum number of arguments supported. Must be even! */ | 15 | /* Maximum number of arguments supported. Must be even! */ |
16 | #define O32_ARGC 32 | 16 | #define O32_ARGC 32 |
17 | /* Number of static registers we save. */ | 17 | /* Number of static registers we save. */ |
18 | #define O32_STATC 11 | 18 | #define O32_STATC 11 |
19 | /* Frame size for both of the above. */ | 19 | /* Frame size for both of the above. */ |
20 | #define O32_FRAMESZ (4 * O32_ARGC + SZREG * O32_STATC) | 20 | #define O32_FRAMESZ (4 * O32_ARGC + SZREG * O32_STATC) |
diff --git a/arch/mips/dec/prom/init.c b/arch/mips/dec/prom/init.c index 468f665de7bb..4e1761e0a09a 100644 --- a/arch/mips/dec/prom/init.c +++ b/arch/mips/dec/prom/init.c | |||
@@ -104,7 +104,7 @@ void __init prom_init(void) | |||
104 | if (prom_is_rex(magic)) | 104 | if (prom_is_rex(magic)) |
105 | rex_clear_cache(); | 105 | rex_clear_cache(); |
106 | 106 | ||
107 | /* Register the early console. */ | 107 | /* Register the early console. */ |
108 | register_prom_console(); | 108 | register_prom_console(); |
109 | 109 | ||
110 | /* Were we compiled with the right CPU option? */ | 110 | /* Were we compiled with the right CPU option? */ |
diff --git a/arch/mips/dec/prom/memory.c b/arch/mips/dec/prom/memory.c index 0aadac742900..8c62316f22f4 100644 --- a/arch/mips/dec/prom/memory.c +++ b/arch/mips/dec/prom/memory.c | |||
@@ -22,7 +22,7 @@ volatile unsigned long mem_err; /* So we know an error occurred */ | |||
22 | 22 | ||
23 | /* | 23 | /* |
24 | * Probe memory in 4MB chunks, waiting for an error to tell us we've fallen | 24 | * Probe memory in 4MB chunks, waiting for an error to tell us we've fallen |
25 | * off the end of real memory. Only suitable for the 2100/3100's (PMAX). | 25 | * off the end of real memory. Only suitable for the 2100/3100's (PMAX). |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #define CHUNK_SIZE 0x400000 | 28 | #define CHUNK_SIZE 0x400000 |
diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c index 741cb4235bde..56e6e2c23683 100644 --- a/arch/mips/dec/setup.c +++ b/arch/mips/dec/setup.c | |||
@@ -65,7 +65,7 @@ EXPORT_SYMBOL(ioasic_base); | |||
65 | /* | 65 | /* |
66 | * IRQ routing and priority tables. Priorites are set as follows: | 66 | * IRQ routing and priority tables. Priorites are set as follows: |
67 | * | 67 | * |
68 | * KN01 KN230 KN02 KN02-BA KN02-CA KN03 | 68 | * KN01 KN230 KN02 KN02-BA KN02-CA KN03 |
69 | * | 69 | * |
70 | * MEMORY CPU CPU CPU ASIC CPU CPU | 70 | * MEMORY CPU CPU CPU ASIC CPU CPU |
71 | * RTC CPU CPU CPU ASIC CPU CPU | 71 | * RTC CPU CPU CPU ASIC CPU CPU |
@@ -413,7 +413,7 @@ static void __init dec_init_kn02(void) | |||
413 | 413 | ||
414 | /* | 414 | /* |
415 | * Machine-specific initialisation for KN02-BA, aka DS5000/1xx | 415 | * Machine-specific initialisation for KN02-BA, aka DS5000/1xx |
416 | * (xx = 20, 25, 33), aka 3min. Also applies to KN04(-BA), aka | 416 | * (xx = 20, 25, 33), aka 3min. Also applies to KN04(-BA), aka |
417 | * DS5000/150, aka 4min. | 417 | * DS5000/150, aka 4min. |
418 | */ | 418 | */ |
419 | static int kn02ba_interrupt[DEC_NR_INTS] __initdata = { | 419 | static int kn02ba_interrupt[DEC_NR_INTS] __initdata = { |
diff --git a/arch/mips/include/asm/dec/ioasic_addrs.h b/arch/mips/include/asm/dec/ioasic_addrs.h index a8665a7611c2..8bd95971fe2d 100644 --- a/arch/mips/include/asm/dec/ioasic_addrs.h +++ b/arch/mips/include/asm/dec/ioasic_addrs.h | |||
@@ -40,7 +40,7 @@ | |||
40 | #define IOASIC_FLOPPY (11*IOASIC_SLOT_SIZE) /* FDC (maxine) */ | 40 | #define IOASIC_FLOPPY (11*IOASIC_SLOT_SIZE) /* FDC (maxine) */ |
41 | #define IOASIC_SCSI (12*IOASIC_SLOT_SIZE) /* ASC SCSI */ | 41 | #define IOASIC_SCSI (12*IOASIC_SLOT_SIZE) /* ASC SCSI */ |
42 | #define IOASIC_FDC_DMA (13*IOASIC_SLOT_SIZE) /* FDC DMA (maxine) */ | 42 | #define IOASIC_FDC_DMA (13*IOASIC_SLOT_SIZE) /* FDC DMA (maxine) */ |
43 | #define IOASIC_SCSI_DMA (14*IOASIC_SLOT_SIZE) /* ??? */ | 43 | #define IOASIC_SCSI_DMA (14*IOASIC_SLOT_SIZE) /* ??? */ |
44 | #define IOASIC_RES_15 (15*IOASIC_SLOT_SIZE) /* unused? */ | 44 | #define IOASIC_RES_15 (15*IOASIC_SLOT_SIZE) /* unused? */ |
45 | 45 | ||
46 | 46 | ||
diff --git a/arch/mips/include/asm/dec/kn01.h b/arch/mips/include/asm/dec/kn01.h index 0eb3241de706..88d9ffd74258 100644 --- a/arch/mips/include/asm/dec/kn01.h +++ b/arch/mips/include/asm/dec/kn01.h | |||
@@ -57,12 +57,12 @@ | |||
57 | /* | 57 | /* |
58 | * System Control & Status Register bits. | 58 | * System Control & Status Register bits. |
59 | */ | 59 | */ |
60 | #define KN01_CSR_MNFMOD (1<<15) /* MNFMOD manufacturing jumper */ | 60 | #define KN01_CSR_MNFMOD (1<<15) /* MNFMOD manufacturing jumper */ |
61 | #define KN01_CSR_STATUS (1<<14) /* self-test result status output */ | 61 | #define KN01_CSR_STATUS (1<<14) /* self-test result status output */ |
62 | #define KN01_CSR_PARDIS (1<<13) /* parity error disable */ | 62 | #define KN01_CSR_PARDIS (1<<13) /* parity error disable */ |
63 | #define KN01_CSR_CRSRTST (1<<12) /* PCC test output */ | 63 | #define KN01_CSR_CRSRTST (1<<12) /* PCC test output */ |
64 | #define KN01_CSR_MONO (1<<11) /* mono/color fb SIMM installed */ | 64 | #define KN01_CSR_MONO (1<<11) /* mono/color fb SIMM installed */ |
65 | #define KN01_CSR_MEMERR (1<<10) /* write timeout error status & ack*/ | 65 | #define KN01_CSR_MEMERR (1<<10) /* write timeout error status & ack*/ |
66 | #define KN01_CSR_VINT (1<<9) /* PCC area detect #2 status & ack */ | 66 | #define KN01_CSR_VINT (1<<9) /* PCC area detect #2 status & ack */ |
67 | #define KN01_CSR_TXDIS (1<<8) /* DZ11 transmit disable */ | 67 | #define KN01_CSR_TXDIS (1<<8) /* DZ11 transmit disable */ |
68 | #define KN01_CSR_VBGTRG (1<<2) /* blue DAC voltage over green (r/o) */ | 68 | #define KN01_CSR_VBGTRG (1<<2) /* blue DAC voltage over green (r/o) */ |
diff --git a/arch/mips/include/asm/dec/kn02ca.h b/arch/mips/include/asm/dec/kn02ca.h index 69dc2a9a2d0f..92c0fe256099 100644 --- a/arch/mips/include/asm/dec/kn02ca.h +++ b/arch/mips/include/asm/dec/kn02ca.h | |||
@@ -68,7 +68,7 @@ | |||
68 | #define KN03CA_IO_SSR_ISDN_RST (1<<12) /* ~ISDN (Am79C30A) reset */ | 68 | #define KN03CA_IO_SSR_ISDN_RST (1<<12) /* ~ISDN (Am79C30A) reset */ |
69 | 69 | ||
70 | #define KN03CA_IO_SSR_FLOPPY_RST (1<<7) /* ~FDC (82077) reset */ | 70 | #define KN03CA_IO_SSR_FLOPPY_RST (1<<7) /* ~FDC (82077) reset */ |
71 | #define KN03CA_IO_SSR_VIDEO_RST (1<<6) /* ~framebuffer reset */ | 71 | #define KN03CA_IO_SSR_VIDEO_RST (1<<6) /* ~framebuffer reset */ |
72 | #define KN03CA_IO_SSR_AB_RST (1<<5) /* ACCESS.bus reset */ | 72 | #define KN03CA_IO_SSR_AB_RST (1<<5) /* ACCESS.bus reset */ |
73 | #define KN03CA_IO_SSR_RES_4 (1<<4) /* unused */ | 73 | #define KN03CA_IO_SSR_RES_4 (1<<4) /* unused */ |
74 | #define KN03CA_IO_SSR_RES_3 (1<<4) /* unused */ | 74 | #define KN03CA_IO_SSR_RES_3 (1<<4) /* unused */ |
diff --git a/arch/mips/include/asm/dec/prom.h b/arch/mips/include/asm/dec/prom.h index 446577712bee..c0ead6313845 100644 --- a/arch/mips/include/asm/dec/prom.h +++ b/arch/mips/include/asm/dec/prom.h | |||
@@ -49,7 +49,7 @@ | |||
49 | 49 | ||
50 | #ifdef CONFIG_64BIT | 50 | #ifdef CONFIG_64BIT |
51 | 51 | ||
52 | #define prom_is_rex(magic) 1 /* KN04 and KN05 are REX PROMs. */ | 52 | #define prom_is_rex(magic) 1 /* KN04 and KN05 are REX PROMs. */ |
53 | 53 | ||
54 | #else /* !CONFIG_64BIT */ | 54 | #else /* !CONFIG_64BIT */ |
55 | 55 | ||