diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:45:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:45:55 +0000 |
| commit | f05fab340298536393c015f1bd6ac1c6b8446590 (patch) | |
| tree | 27505507f7b4450a2f3e4e1f9ed69f0f24a98e91 /include | |
| parent | 95db6b748fc86297827fbd9c9ef174d491c9ad89 (diff) | |
DDB 5074 updates from Geert.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/io.h | 20 | ||||
| -rw-r--r-- | include/asm-mips/serial.h | 14 |
2 files changed, 12 insertions, 22 deletions
diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h index a881f2b06..c02ddfd86 100644 --- a/include/asm-mips/io.h +++ b/include/asm-mips/io.h @@ -1,4 +1,4 @@ -/* $Id: io.h,v 1.10 2000/01/29 01:42:28 ralf Exp $ +/* $Id: io.h,v 1.11 2000/02/04 07:40:53 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 @@ -153,23 +153,23 @@ extern inline void iounmap(void *addr) * 24-31 on SNI. * XXX more SNI hacks. */ -#define readb(addr) (*(volatile unsigned char *) (0xa0000000 + (unsigned long)(addr))) -#define readw(addr) (*(volatile unsigned short *) (0xa0000000 + (unsigned long)(addr))) -#define readl(addr) (*(volatile unsigned int *) (0xa0000000 + (unsigned long)(addr))) +#define readb(addr) (*(volatile unsigned char *)(addr)) +#define readw(addr) (*(volatile unsigned short *)(addr)) +#define readl(addr) (*(volatile unsigned int *)(addr)) #define __raw_readb readb #define __raw_readw readw #define __raw_readl readl -#define writeb(b,addr) (*(volatile unsigned char *) (0xa0000000 + (unsigned long)(addr)) = (b)) -#define writew(b,addr) (*(volatile unsigned short *) (0xa0000000 + (unsigned long)(addr)) = (b)) -#define writel(b,addr) (*(volatile unsigned int *) (0xa0000000 + (unsigned long)(addr)) = (b)) +#define writeb(b,addr) (*(volatile unsigned char *)(addr)) = (b) +#define writew(b,addr) (*(volatile unsigned short *)(addr)) = (b) +#define writel(b,addr) (*(volatile unsigned int *)(addr)) = (b) #define __raw_writeb writeb #define __raw_writew writew #define __raw_writel writel -#define memset_io(a,b,c) memset((void *)(0xa0000000 + (unsigned long)a),(b),(c)) -#define memcpy_fromio(a,b,c) memcpy((a),(void *)(0xa0000000 + (unsigned long)(b)),(c)) -#define memcpy_toio(a,b,c) memcpy((void *)(0xa0000000 + (unsigned long)(a)),(b),(c)) +#define memset_io(a,b,c) memset((void *)(a),(b),(c)) +#define memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c)) +#define memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c)) /* END SNI HACKS ... */ diff --git a/include/asm-mips/serial.h b/include/asm-mips/serial.h index 3fbefe683..b01e435f7 100644 --- a/include/asm-mips/serial.h +++ b/include/asm-mips/serial.h @@ -1,4 +1,4 @@ -/* $Id: serial.h,v 1.7 2000/01/31 03:44:29 ralf Exp $ +/* $Id: serial.h,v 1.8 2000/02/04 07:40:53 ralf Exp $ * * Copyright (C) 1999 by Ralf Baechle * Copyright (C) 1999, 2000 Silicon Graphics, Inc. @@ -147,18 +147,8 @@ #define MCA_SERIAL_PORT_DFNS #endif -#ifdef CONFIG_DDB5074 -#define DDB5074_SERIAL_PORT_DEFNS \ - { 0, 520833, 0, 20, \ - STD_COM_FLAGS, 0, 0, 0, 0, 0, 0, 0, \ - (u8 *)0xbfa00300, 3 } -#else -#define DDB5074_SERIAL_PORT_DEFNS -#endif - #define SERIAL_PORT_DFNS \ JAZZ_SERIAL_PORT_DEFNS \ STD_SERIAL_PORT_DEFNS \ EXTRA_SERIAL_PORT_DEFNS \ - HUB6_SERIAL_PORT_DFNS \ - DDB5074_SERIAL_PORT_DEFNS + HUB6_SERIAL_PORT_DFNS |