aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-mips
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-mips')
-rw-r--r--include/asm-mips/bootinfo.h2
-rw-r--r--include/asm-mips/serial.h26
-rw-r--r--include/asm-mips/war.h4
3 files changed, 3 insertions, 29 deletions
diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h
index 476563924fd1..8b76e7602425 100644
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -114,7 +114,7 @@
114#define MACH_GROUP_MOMENCO 12 /* Momentum Boards */ 114#define MACH_GROUP_MOMENCO 12 /* Momentum Boards */
115#define MACH_MOMENCO_OCELOT 0 115#define MACH_MOMENCO_OCELOT 0
116#define MACH_MOMENCO_OCELOT_G 1 /* no more supported (may 2007) */ 116#define MACH_MOMENCO_OCELOT_G 1 /* no more supported (may 2007) */
117#define MACH_MOMENCO_OCELOT_C 2 117#define MACH_MOMENCO_OCELOT_C 2 /* no more supported (jun 2007) */
118#define MACH_MOMENCO_JAGUAR_ATX 3 /* no more supported (may 2007) */ 118#define MACH_MOMENCO_JAGUAR_ATX 3 /* no more supported (may 2007) */
119#define MACH_MOMENCO_OCELOT_3 4 119#define MACH_MOMENCO_OCELOT_3 4
120 120
diff --git a/include/asm-mips/serial.h b/include/asm-mips/serial.h
index 01f1a8213ccc..5b9c8ea977b8 100644
--- a/include/asm-mips/serial.h
+++ b/include/asm-mips/serial.h
@@ -97,31 +97,6 @@
97#define MOMENCO_OCELOT_SERIAL_PORT_DEFNS 97#define MOMENCO_OCELOT_SERIAL_PORT_DEFNS
98#endif 98#endif
99 99
100#ifdef CONFIG_MOMENCO_OCELOT_C
101/* Ordinary NS16552 duart with a 20MHz crystal. */
102#define OCELOT_C_BASE_BAUD ( 20000000 / 16 )
103
104#define OCELOT_C_SERIAL1_IRQ 80
105#define OCELOT_C_SERIAL1_BASE 0xfd000020
106
107#define OCELOT_C_SERIAL2_IRQ 81
108#define OCELOT_C_SERIAL2_BASE 0xfd000000
109
110#define _OCELOT_C_SERIAL_INIT(int, base) \
111 { .baud_base = OCELOT_C_BASE_BAUD, \
112 .irq = (int), \
113 .flags = STD_COM_FLAGS, \
114 .iomem_base = (u8 *) base, \
115 .iomem_reg_shift = 2, \
116 .io_type = SERIAL_IO_MEM \
117 }
118#define MOMENCO_OCELOT_C_SERIAL_PORT_DEFNS \
119 _OCELOT_C_SERIAL_INIT(OCELOT_C_SERIAL1_IRQ, OCELOT_C_SERIAL1_BASE), \
120 _OCELOT_C_SERIAL_INIT(OCELOT_C_SERIAL2_IRQ, OCELOT_C_SERIAL2_BASE)
121#else
122#define MOMENCO_OCELOT_C_SERIAL_PORT_DEFNS
123#endif
124
125#ifdef CONFIG_DDB5477 100#ifdef CONFIG_DDB5477
126#include <asm/ddb5xxx/ddb5477.h> 101#include <asm/ddb5xxx/ddb5477.h>
127#define DDB5477_SERIAL_PORT_DEFNS \ 102#define DDB5477_SERIAL_PORT_DEFNS \
@@ -151,7 +126,6 @@
151 IP32_SERIAL_PORT_DEFNS \ 126 IP32_SERIAL_PORT_DEFNS \
152 JAZZ_SERIAL_PORT_DEFNS \ 127 JAZZ_SERIAL_PORT_DEFNS \
153 STD_SERIAL_PORT_DEFNS \ 128 STD_SERIAL_PORT_DEFNS \
154 MOMENCO_OCELOT_C_SERIAL_PORT_DEFNS \
155 MOMENCO_OCELOT_SERIAL_PORT_DEFNS \ 129 MOMENCO_OCELOT_SERIAL_PORT_DEFNS \
156 MOMENCO_OCELOT_3_SERIAL_PORT_DEFNS 130 MOMENCO_OCELOT_3_SERIAL_PORT_DEFNS
157 131
diff --git a/include/asm-mips/war.h b/include/asm-mips/war.h
index ec0eeebd8802..4396b2fb5e2d 100644
--- a/include/asm-mips/war.h
+++ b/include/asm-mips/war.h
@@ -185,8 +185,8 @@
185#if defined(CONFIG_BASLER_EXCITE) || defined(CONFIG_MOMENCO_JAGUAR_ATX) || \ 185#if defined(CONFIG_BASLER_EXCITE) || defined(CONFIG_MOMENCO_JAGUAR_ATX) || \
186 defined(CONFIG_MIPS_ATLAS) || defined(CONFIG_MIPS_MALTA) || \ 186 defined(CONFIG_MIPS_ATLAS) || defined(CONFIG_MIPS_MALTA) || \
187 defined(CONFIG_MOMENCO_OCELOT) || defined(CONFIG_MOMENCO_OCELOT_3) || \ 187 defined(CONFIG_MOMENCO_OCELOT) || defined(CONFIG_MOMENCO_OCELOT_3) || \
188 defined(CONFIG_MOMENCO_OCELOT_C) || defined(CONFIG_PMC_YOSEMITE) || \ 188 defined(CONFIG_PMC_YOSEMITE) || defined(CONFIG_SGI_IP32) || \
189 defined(CONFIG_SGI_IP32) || defined(CONFIG_WR_PPMC) 189 defined(CONFIG_WR_PPMC)
190#define ICACHE_REFILLS_WORKAROUND_WAR 1 190#define ICACHE_REFILLS_WORKAROUND_WAR 1
191#endif 191#endif
192 192