summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/mips/boot/Makefile2
-rw-r--r--arch/mips/jazz/int-handler.S14
-rw-r--r--arch/mips/kernel/irq.c15
-rw-r--r--arch/mips/kernel/pci.c14
-rw-r--r--arch/mips/lib/Makefile5
-rw-r--r--arch/mips/lib/csum_partial.S9
-rw-r--r--arch/mips/sni/int-handler.S6
-rw-r--r--arch/mips/sni/pci.c10
-rw-r--r--arch/mips/sni/setup.c7
-rw-r--r--drivers/char/serial.c14
-rw-r--r--drivers/scsi/esp.c4
-rw-r--r--drivers/scsi/esp.h2
-rw-r--r--include/asm-mips/pci.h8
-rw-r--r--include/asm-mips/serial.h28
14 files changed, 60 insertions, 78 deletions
diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile
index dd834efd9..906e85e9b 100644
--- a/arch/mips/boot/Makefile
+++ b/arch/mips/boot/Makefile
@@ -40,8 +40,8 @@ zdisk: zImage
mcopy -o zImage a:vmlinux; \
fi
+# Don't build dependencies, this may die if $(CC) isn't gcc
dep:
- $(CPP) -M *.[cS] > .depend
clean:
rm -f zImage zImage.tmp mkboot
diff --git a/arch/mips/jazz/int-handler.S b/arch/mips/jazz/int-handler.S
index ca776c325..3351725bf 100644
--- a/arch/mips/jazz/int-handler.S
+++ b/arch/mips/jazz/int-handler.S
@@ -1,16 +1,17 @@
-/*
- * arch/mips/jazz/pica.S
+/* $Id: int-handler.S,v 1.7 1997/12/29 11:33:56 tsbogend Exp $
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
*
- * Copyright (C) 1995, 1996 by Ralf Baechle and Andreas Busse
+ * Copyright (C) 1995, 1996, 1997, 1998 by Ralf Baechle and Andreas Busse
*
- * Jazz family specific stuff
+ * Jazz family specific interrupt stuff
*
* To do: On Jazz machines we remap some non-ISA interrupts to ISA
* interrupts. These interrupts should use their own vectors.
* Squeeze the last cycles out of the handlers. Only a dead
* cycle is a good cycle.
- *
- * $Id: int-handler.S,v 1.6 1997/12/29 00:06:49 tsbogend Exp $
*/
#include <asm/asm.h>
#include <asm/mipsconfig.h>
@@ -27,7 +28,6 @@
NESTED(jazz_handle_int, PT_SIZE, ra)
.set noat
SAVE_ALL
- REG_S sp,PT_OR2(sp)
CLI
.set at
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index 9dcca6184..c2c018045 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -1,10 +1,13 @@
-/*
+/* $Id: irq.c,v 1.10 1998/05/07 02:57:17 ralf Exp $
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
* Code to handle x86 style IRQs plus some generic interrupt stuff.
*
* Copyright (C) 1992 Linus Torvalds
- * Copyright (C) 1994, 1995, 1996, 1997 Ralf Baechle
- *
- * $Id: irq.c,v 1.9 1998/03/22 23:27:12 ralf Exp $
+ * Copyright (C) 1994, 1995, 1996, 1997, 1998 Ralf Baechle
*/
#include <linux/errno.h>
#include <linux/init.h>
@@ -312,13 +315,13 @@ int probe_irq_off (unsigned long irqs)
int (*irq_cannonicalize)(int irq);
-static int 8259a_irq_cannonicalize(int irq)
+static int i8259a_irq_cannonicalize(int irq)
{
return ((irq == 2) ? 9 : irq);
}
__initfunc(void init_IRQ(void))
{
- irq_cannonicalize = 8259a_irq_cannonicalize;
+ irq_cannonicalize = i8259a_irq_cannonicalize;
irq_setup();
}
diff --git a/arch/mips/kernel/pci.c b/arch/mips/kernel/pci.c
index 71a57b73e..3b02ce3db 100644
--- a/arch/mips/kernel/pci.c
+++ b/arch/mips/kernel/pci.c
@@ -1,9 +1,12 @@
-/*
+/* $Id$
+ *
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* MIPS implementation of PCI BIOS services for PCI support.
+ *
+ * Copyright (C) 1997, 1998 Ralf Baechle
*/
#include <linux/config.h>
#include <linux/init.h>
@@ -19,10 +22,8 @@ struct pci_ops *pci_ops;
/*
* BIOS32 replacement.
*/
-__initfunc(unsigned long pcibios_init(unsigned long memory_start,
- unsigned long memory_end))
+__initfunc(void pcibios_init(void))
{
- return memory_start;
}
/*
@@ -39,10 +40,9 @@ int pcibios_present (void)
* each PCI chipset configuration. We just run the hook to the machine
* specific implementation.
*/
-unsigned long pcibios_fixup (unsigned long memory_start,
- unsigned long memory_end)
+void pcibios_fixup (void)
{
- return pci_ops->pcibios_fixup(memory_start, memory_end);
+ return pci_ops->pcibios_fixup();
}
int pcibios_read_config_byte (unsigned char bus, unsigned char dev_fn,
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index 597202403..a3aebbb12 100644
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -1,8 +1,7 @@
+# $Id: Makefile,v 1.5 1998/05/04 09:12:51 ralf Exp $
#
# Makefile for MIPS-specific library files..
#
-# $Id: Makefile,v 1.9 1998/05/03 00:28:00 ralf Exp $
-#
.S.s:
$(CPP) $(CFLAGS) $< -o $*.s
@@ -10,7 +9,7 @@
$(CC) $(CFLAGS) -c $< -o $*.o
L_TARGET = lib.a
-L_OBJS = csum_partial.o csum_partial_copy.o dump_tlb.o ide-std.c ide-no.o \
+L_OBJS = csum_partial.o csum_partial_copy.o dump_tlb.o ide-std.o ide-no.o \
memset.o memcpy.o strlen_user.o strncpy_user.o tags.o watch.o
include $(TOPDIR)/Rules.make
diff --git a/arch/mips/lib/csum_partial.S b/arch/mips/lib/csum_partial.S
index ce43987d8..66fd03031 100644
--- a/arch/mips/lib/csum_partial.S
+++ b/arch/mips/lib/csum_partial.S
@@ -1,14 +1,13 @@
-/*
+/* $Id: csum_partial.S,v 1.1 1998/05/04 09:12:52 ralf Exp $
+ *
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Copyright (C) 1998 Ralf Baechle
- *
- * $Id: csum_partial.S,v 1.2 1998/04/22 03:26:19 ralf Exp $
*/
-#include <sys/asm.h>
-#include <sys/regdef.h>
+#include <asm/asm.h>
+#include <asm/regdef.h>
#define ADDC(sum,reg) \
addu sum, reg; \
diff --git a/arch/mips/sni/int-handler.S b/arch/mips/sni/int-handler.S
index b69c44bf8..3c920954d 100644
--- a/arch/mips/sni/int-handler.S
+++ b/arch/mips/sni/int-handler.S
@@ -1,9 +1,8 @@
-/*
+/* $Id: int-handler.S,v 1.2 1997/12/01 17:57:40 ralf Exp $
+ *
* SNI RM200 PCI specific interrupt handler code.
*
* Copyright (C) 1994 - 1997 by Ralf Baechle
- *
- * $Id: int-handler.S,v 1.3 1997/12/01 16:39:24 ralf Exp $
*/
#include <asm/asm.h>
#include <linux/config.h>
@@ -18,7 +17,6 @@
.align 5
NESTED(sni_rm200_pci_handle_int, PT_SIZE, sp)
SAVE_ALL
- REG_S sp,PT_OR2(sp)
CLI
.set at
diff --git a/arch/mips/sni/pci.c b/arch/mips/sni/pci.c
index 0e497450a..fe538d277 100644
--- a/arch/mips/sni/pci.c
+++ b/arch/mips/sni/pci.c
@@ -1,11 +1,12 @@
-/*
+/* $Id: pci.c,v 1.5 1998/05/07 02:57:22 ralf Exp $
+ *
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* SNI specific PCI support for RM200/RM300.
*
- * $Id: pci.c,v 1.5 1998/05/04 01:15:23 ralf Exp $
+ * Copyright (C) 1997, 1998 Ralf Baechle
*/
#include <linux/config.h>
#include <linux/pci.h>
@@ -25,8 +26,7 @@ do { \
(where & 0xfc); \
} while(0);
-static unsigned long sni_rm200_pcibios_fixup (unsigned long memory_start,
- unsigned long memory_end)
+static void sni_rm200_pcibios_fixup (void)
{
/*
* TODO: Fix PCI_INTERRUPT_LINE register for onboard cards.
@@ -35,8 +35,6 @@ static unsigned long sni_rm200_pcibios_fixup (unsigned long memory_start,
*/
pcibios_write_config_byte(0, PCI_DEVFN(1, 0), PCI_INTERRUPT_LINE,
PCIMT_IRQ_SCSI);
-
- return memory_start;
}
/*
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c
index d9fa7c8de..d2b0109e7 100644
--- a/arch/mips/sni/setup.c
+++ b/arch/mips/sni/setup.c
@@ -1,4 +1,5 @@
-/*
+/* $Id: setup.c,v 1.6 1998/05/04 09:12:58 ralf Exp $
+ *
* Setup pointers to hardware dependant routines.
*
* This file is subject to the terms and conditions of the GNU General Public
@@ -6,8 +7,6 @@
* for more details.
*
* Copyright (C) 1996, 1997, 1998 by Ralf Baechle
- *
- * $Id: setup.c,v 1.5 1998/03/17 22:07:43 ralf Exp $
*/
#include <asm/ptrace.h>
#include <linux/config.h>
@@ -88,7 +87,7 @@ static inline void sni_pcimt_detect(void)
char boardtype[80];
unsigned char csmsr;
char *p = boardtype;
- unsigned int asic, cacheconf;
+ unsigned int asic;
csmsr = *(volatile unsigned char *)PCIMT_CSMSR;
diff --git a/drivers/char/serial.c b/drivers/char/serial.c
index 746b93680..2b3e904b2 100644
--- a/drivers/char/serial.c
+++ b/drivers/char/serial.c
@@ -3008,20 +3008,6 @@ __initfunc(int rs_init(void))
dualsp_serial_init ();
#endif
- rs_table = rs_table_std;
-#ifdef __mips__
- if (mips_machgroup == MACH_GROUP_JAZZ) {
- rs_table = rs_table_jazz;
- if (mips_machtype == MACH_OLIVETTI_M700) {
- /*
- * Some jazz machines use the normal crystal, some
- * a different clock ...
- */
- rs_table[0].baud_base = BASE_BAUD;
- rs_table[1].baud_base = BASE_BAUD;
- }
- }
-#endif
init_bh(SERIAL_BH, do_serial_bh);
timer_table[RS_TIMER].fn = rs_timer;
timer_table[RS_TIMER].expires = 0;
diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c
index d6059c153..eb6ea16db 100644
--- a/drivers/scsi/esp.c
+++ b/drivers/scsi/esp.c
@@ -91,7 +91,7 @@ struct Sparc_ESP *espchain = 0;
int nesps = 0, esps_in_use = 0, esps_running = 0;
void esp_intr(int irq, void *dev_id, struct pt_regs *pregs);
-static void do_esp_intr(int irq, void *dev_id, struct pt_regs *pregs);
+void do_esp_intr(int irq, void *dev_id, struct pt_regs *pregs);
/* Debugging routines */
struct esp_cmdstrings {
@@ -3609,7 +3609,7 @@ esp_handle_done:
return;
}
-static void do_esp_intr(int irq, void *dev_id, struct pt_regs *pregs)
+void do_esp_intr(int irq, void *dev_id, struct pt_regs *pregs)
{
unsigned long flags;
diff --git a/drivers/scsi/esp.h b/drivers/scsi/esp.h
index f6f9718b5..76b9ca9f4 100644
--- a/drivers/scsi/esp.h
+++ b/drivers/scsi/esp.h
@@ -534,7 +534,7 @@ extern int nesps, esps_in_use, esps_running;
/* For our interrupt engine. */
#define for_each_esp(esp) \
for((esp) = espchain; (esp); (esp) = (esp)->next)
-
+extern void do_esp_intr(int irq, void *dev_id, struct pt_regs *pregs);
/* External functions */
extern struct Sparc_ESP *esp_allocate(Scsi_Host_Template *, void *);
diff --git a/include/asm-mips/pci.h b/include/asm-mips/pci.h
index 3d48c2ca3..d2ff867f2 100644
--- a/include/asm-mips/pci.h
+++ b/include/asm-mips/pci.h
@@ -1,18 +1,18 @@
-/*
+/* $Id: pci.h,v 1.2 1997/12/01 18:00:40 ralf Exp $
+ *
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Declarations for the MIPS specific implementation of the PCI BIOS32 services.
*
- * $Id: pci.h,v 1.2 1997/09/20 21:16:37 ralf Exp $
+ * Copyright (C) 1997, 1998 Ralf Baechle
*/
#ifndef __ASM_MIPS_PCI_H
#define __ASM_MIPS_PCI_H
struct pci_ops {
- unsigned long (*pcibios_fixup) (unsigned long memory_start,
- unsigned long memory_end);
+ unsigned long (*pcibios_fixup) (void);
int (*pcibios_read_config_byte) (unsigned char bus,
unsigned char dev_fn,
unsigned char where,
diff --git a/include/asm-mips/serial.h b/include/asm-mips/serial.h
index 47c6ea0b7..7d4f6ecfe 100644
--- a/include/asm-mips/serial.h
+++ b/include/asm-mips/serial.h
@@ -1,9 +1,10 @@
-/*
- * include/asm-mips/serial.h
+/* $Id: serial.h,v 1.1 1998/05/04 12:43:16 ralf Exp $
*
- * $Id: serial.h,v 1.1 1998/05/04 12:43:16 ralf Exp $
+ * include/asm-mips/serial.h
*/
#include <linux/config.h>
+#include <asm/bootinfo.h>
+#include <asm/jazz.h>
/*
* This assumes you have a 1.8432 MHz clock for your UART.
@@ -12,12 +13,11 @@
* clock, since the 16550A is capable of handling a top speed of 1.5
* megabits/second; but this requires the faster clock.
*/
-#ifdef CONFIG_MIPS_JAZZ
-/* XXX This doesn't seem to be true for all Jazz machines. */
-#define JAZZ_BASE_BAUD ( 8000000 / 16 ) /* ( 3072000 / 16) */
-#else
#define BASE_BAUD ( 1843200 / 16 )
-#endif
+
+/* Some Jazz machines seem to have an 8MHz crystal clock but I don't know
+ exactly which ones ... XXX */
+#define JAZZ_BASE_BAUD ( 8000000 / 16 ) /* ( 3072000 / 16) */
/* Standard COM flags (except for COM4, because of the 8514 problem) */
#ifdef CONFIG_SERIAL_DETECT_IRQ
@@ -34,7 +34,7 @@
#define BOCA_FLAGS 0
#define HUB6_FLAGS 0
#endif
-
+
/*
* The following define the access methods for the HUB6 card. All
* access is through two ports for all 24 possible chips. The card is
@@ -54,9 +54,9 @@
#ifdef CONFIG_MIPS_JAZZ
#define JAZZ_SERIAL_PORT_DEFNS \
/* UART CLK PORT IRQ FLAGS */ \
- { 0, JAZZ_BASE_BAUD, JAZZ_SERIAL1_BASE, /* ttyS0 */
- JAZZ_SERIAL1_IRQ, STD_COM_FLAGS },
- { 0, JAZZ_BASE_BAUD, JAZZ_SERIAL2_BASE, /* ttyS1 */
+ { 0, JAZZ_BASE_BAUD, JAZZ_SERIAL1_BASE, /* ttyS0 */ \
+ JAZZ_SERIAL1_IRQ, STD_COM_FLAGS }, \
+ { 0, JAZZ_BASE_BAUD, JAZZ_SERIAL2_BASE, /* ttyS1 */ \
JAZZ_SERIAL2_IRQ, STD_COM_FLAGS },
#else
#define JAZZ_SERIAL_PORT_DEFNS
@@ -137,8 +137,8 @@
#define MCA_SERIAL_PORT_DFNS
#endif
-#define JAZZ_PORT_DFNS \
- SERIAL_PORT_DFNS \
+#define SERIAL_PORT_DFNS \
+ JAZZ_SERIAL_PORT_DEFNS \
STD_SERIAL_PORT_DEFNS \
EXTRA_SERIAL_PORT_DEFNS \
HUB6_SERIAL_PORT_DFNS
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 04:17:46 +0000