Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv30237/include/asm-mips
Modified Files:
bugs.h serial.h
Log Message:
* the proper fix for the ev96100 serial console
* ev96100 freezes when using the 'wait' instruction
Index: bugs.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/bugs.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- bugs.h 2001/10/25 17:17:45 1.4
+++ bugs.h 2001/10/26 22:36:04 1.5
@@ -36,7 +36,10 @@
case CPU_R4700:
case CPU_R5000:
case CPU_NEVADA:
+#ifndef CONFIG_MIPS_EV96100
+ /* ev96100 freezes when using the wait instruction */
case CPU_RM7000:
+#endif
case CPU_TX49XX:
cpu_wait = r4k_wait;
printk(" available.\n");
Index: serial.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/serial.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serial.h 2001/07/09 21:50:55 1.2
+++ serial.h 2001/10/26 22:36:04 1.3
@@ -103,10 +103,12 @@
#define EV96100_SERIAL_PORT_DEFNS \
{ baud_base: EV96100_BASE_BAUD, port: EV96100_UART0_REGS_BASE, \
irq: EV96100INT_UART_0, flags: STD_COM_FLAGS, type: 0x3, \
- iomem_base: EV96100_UART0_REGS_BASE }, \
+ iomem_base: EV96100_UART0_REGS_BASE, iomem_reg_shift: 2, \
+ io_type: SERIAL_IO_MEM }, \
{ baud_base: EV96100_BASE_BAUD, port: EV96100_UART1_REGS_BASE, \
irq: EV96100INT_UART_0, flags: STD_COM_FLAGS, type: 0x3, \
- iomem_base: EV96100_UART1_REGS_BASE },
+ iomem_base: EV96100_UART1_REGS_BASE, iomem_reg_shift: 2, \
+ io_type: SERIAL_IO_MEM },
#else
#define EV96100_SERIAL_PORT_DEFNS
#endif
|
