diff options
author | Franck Bui-Huu <fbuihuu@gmail.com> | 2007-05-07 12:01:52 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-05-11 09:28:31 -0400 |
commit | bef964e55ac128b1a6894c68171d0b22263449f8 (patch) | |
tree | f462bd850cbdc5273d6f0923350c694fc89e4abc /include | |
parent | 1e54f778af4467b816bf1289e7c4bf7e50067b7b (diff) |
[MIPS] Remove Momenco Jaguar ATX support
It has some hackish code and it odd DMA results in the need to support
old features in kernel code.
Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-mips/bootinfo.h | 2 | ||||
-rw-r--r-- | include/asm-mips/mach-ja/cpu-feature-overrides.h | 45 | ||||
-rw-r--r-- | include/asm-mips/mach-ja/spaces.h | 20 | ||||
-rw-r--r-- | include/asm-mips/serial.h | 19 |
4 files changed, 1 insertions, 85 deletions
diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h index 198ecc08ab40..b0c329783ac5 100644 --- a/include/asm-mips/bootinfo.h +++ b/include/asm-mips/bootinfo.h | |||
@@ -121,7 +121,7 @@ | |||
121 | #define MACH_MOMENCO_OCELOT 0 | 121 | #define MACH_MOMENCO_OCELOT 0 |
122 | #define MACH_MOMENCO_OCELOT_G 1 /* no more supported (may 2007) */ | 122 | #define MACH_MOMENCO_OCELOT_G 1 /* no more supported (may 2007) */ |
123 | #define MACH_MOMENCO_OCELOT_C 2 | 123 | #define MACH_MOMENCO_OCELOT_C 2 |
124 | #define MACH_MOMENCO_JAGUAR_ATX 3 | 124 | #define MACH_MOMENCO_JAGUAR_ATX 3 /* no more supported (may 2007) */ |
125 | #define MACH_MOMENCO_OCELOT_3 4 | 125 | #define MACH_MOMENCO_OCELOT_3 4 |
126 | 126 | ||
127 | /* | 127 | /* |
diff --git a/include/asm-mips/mach-ja/cpu-feature-overrides.h b/include/asm-mips/mach-ja/cpu-feature-overrides.h deleted file mode 100644 index 84b6dead0e8a..000000000000 --- a/include/asm-mips/mach-ja/cpu-feature-overrides.h +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | /* | ||
2 | * This file is subject to the terms and conditions of the GNU General Public | ||
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * Copyright (C) 2003, 2004 Ralf Baechle | ||
7 | */ | ||
8 | #ifndef __ASM_MACH_JA_CPU_FEATURE_OVERRIDES_H | ||
9 | #define __ASM_MACH_JA_CPU_FEATURE_OVERRIDES_H | ||
10 | |||
11 | /* | ||
12 | * Momentum Jaguar ATX always has the RM9000 processor. | ||
13 | */ | ||
14 | #define cpu_has_watch 1 | ||
15 | #define cpu_has_mips16 0 | ||
16 | #define cpu_has_divec 0 | ||
17 | #define cpu_has_vce 0 | ||
18 | #define cpu_has_cache_cdex_p 0 | ||
19 | #define cpu_has_cache_cdex_s 0 | ||
20 | #define cpu_has_prefetch 1 | ||
21 | #define cpu_has_mcheck 0 | ||
22 | #define cpu_has_ejtag 0 | ||
23 | |||
24 | #define cpu_has_llsc 1 | ||
25 | #define cpu_has_vtag_icache 0 | ||
26 | #define cpu_has_dc_aliases 0 | ||
27 | #define cpu_has_ic_fills_f_dc 0 | ||
28 | #define cpu_has_dsp 0 | ||
29 | #define cpu_icache_snoops_remote_store 0 | ||
30 | |||
31 | #define cpu_has_nofpuex 0 | ||
32 | #define cpu_has_64bits 1 | ||
33 | |||
34 | #define cpu_has_inclusive_pcaches 0 | ||
35 | |||
36 | #define cpu_dcache_line_size() 32 | ||
37 | #define cpu_icache_line_size() 32 | ||
38 | #define cpu_scache_line_size() 32 | ||
39 | |||
40 | #define cpu_has_mips32r1 0 | ||
41 | #define cpu_has_mips32r2 0 | ||
42 | #define cpu_has_mips64r1 0 | ||
43 | #define cpu_has_mips64r2 0 | ||
44 | |||
45 | #endif /* __ASM_MACH_JA_CPU_FEATURE_OVERRIDES_H */ | ||
diff --git a/include/asm-mips/mach-ja/spaces.h b/include/asm-mips/mach-ja/spaces.h deleted file mode 100644 index 8466a0e69c79..000000000000 --- a/include/asm-mips/mach-ja/spaces.h +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | /* | ||
2 | * This file is subject to the terms and conditions of the GNU General Public | ||
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * Copyright (C) 1994 - 1999, 2000, 03, 04 Ralf Baechle | ||
7 | * Copyright (C) 2000, 2002 Maciej W. Rozycki | ||
8 | * Copyright (C) 1990, 1999, 2000 Silicon Graphics, Inc. | ||
9 | */ | ||
10 | #ifndef __ASM_MACH_JA_SPACES_H | ||
11 | #define __ASM_MACH_JA_SPACES_H | ||
12 | |||
13 | /* | ||
14 | * Memory above this physical address will be considered highmem. | ||
15 | */ | ||
16 | #define HIGHMEM_START 0x08000000UL | ||
17 | |||
18 | #include_next <spaces.h> | ||
19 | |||
20 | #endif /* __ASM_MACH_JA_SPACES_H */ | ||
diff --git a/include/asm-mips/serial.h b/include/asm-mips/serial.h index 5e0da6e2d698..ce51213d84f9 100644 --- a/include/asm-mips/serial.h +++ b/include/asm-mips/serial.h | |||
@@ -81,25 +81,6 @@ | |||
81 | #define STD_SERIAL_PORT_DEFNS | 81 | #define STD_SERIAL_PORT_DEFNS |
82 | #endif /* CONFIG_HAVE_STD_PC_SERIAL_PORTS */ | 82 | #endif /* CONFIG_HAVE_STD_PC_SERIAL_PORTS */ |
83 | 83 | ||
84 | #ifdef CONFIG_MOMENCO_JAGUAR_ATX | ||
85 | /* Ordinary NS16552 duart with a 20MHz crystal. */ | ||
86 | #define JAGUAR_ATX_UART_CLK 20000000 | ||
87 | #define JAGUAR_ATX_BASE_BAUD (JAGUAR_ATX_UART_CLK / 16) | ||
88 | |||
89 | #define JAGUAR_ATX_SERIAL1_IRQ 6 | ||
90 | #define JAGUAR_ATX_SERIAL1_BASE 0xfd000023L | ||
91 | |||
92 | #define _JAGUAR_ATX_SERIAL_INIT(int, base) \ | ||
93 | { .baud_base = JAGUAR_ATX_BASE_BAUD, irq: int, \ | ||
94 | .flags = (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST), \ | ||
95 | .iomem_base = (u8 *) base, iomem_reg_shift: 2, \ | ||
96 | io_type: SERIAL_IO_MEM } | ||
97 | #define MOMENCO_JAGUAR_ATX_SERIAL_PORT_DEFNS \ | ||
98 | _JAGUAR_ATX_SERIAL_INIT(JAGUAR_ATX_SERIAL1_IRQ, JAGUAR_ATX_SERIAL1_BASE) | ||
99 | #else | ||
100 | #define MOMENCO_JAGUAR_ATX_SERIAL_PORT_DEFNS | ||
101 | #endif | ||
102 | |||
103 | #ifdef CONFIG_MOMENCO_OCELOT_3 | 84 | #ifdef CONFIG_MOMENCO_OCELOT_3 |
104 | #define OCELOT_3_BASE_BAUD ( 20000000 / 16 ) | 85 | #define OCELOT_3_BASE_BAUD ( 20000000 / 16 ) |
105 | #define OCELOT_3_SERIAL_IRQ 6 | 86 | #define OCELOT_3_SERIAL_IRQ 6 |