diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-mips/jmr3927/jmr3927.h | 14 | ||||
-rw-r--r-- | include/asm-mips/serial.h | 12 |
2 files changed, 0 insertions, 26 deletions
diff --git a/include/asm-mips/jmr3927/jmr3927.h b/include/asm-mips/jmr3927/jmr3927.h index 86df317b4078..baf412967afa 100644 --- a/include/asm-mips/jmr3927/jmr3927.h +++ b/include/asm-mips/jmr3927/jmr3927.h | |||
@@ -202,20 +202,6 @@ static inline int jmr3927_have_isac(void) | |||
202 | #endif /* !__ASSEMBLY__ */ | 202 | #endif /* !__ASSEMBLY__ */ |
203 | 203 | ||
204 | /* | 204 | /* |
205 | * UART defines for serial.h | ||
206 | */ | ||
207 | |||
208 | /* use Pre-scaler T0 (1/2) */ | ||
209 | #define JMR3927_BASE_BAUD (JMR3927_IMCLK / 2 / 16) | ||
210 | |||
211 | #define UART0_ADDR 0xfffef300 | ||
212 | #define UART1_ADDR 0xfffef400 | ||
213 | #define UART0_INT JMR3927_IRQ_IRC_SIO0 | ||
214 | #define UART1_INT JMR3927_IRQ_IRC_SIO1 | ||
215 | #define UART0_FLAGS ASYNC_BOOT_AUTOCONF | ||
216 | #define UART1_FLAGS 0 | ||
217 | |||
218 | /* | ||
219 | * IRQ mappings | 205 | * IRQ mappings |
220 | */ | 206 | */ |
221 | 207 | ||
diff --git a/include/asm-mips/serial.h b/include/asm-mips/serial.h index ce1043530e59..e796d75f027e 100644 --- a/include/asm-mips/serial.h +++ b/include/asm-mips/serial.h | |||
@@ -103,17 +103,6 @@ | |||
103 | #define IVR_SERIAL_PORT_DEFNS | 103 | #define IVR_SERIAL_PORT_DEFNS |
104 | #endif | 104 | #endif |
105 | 105 | ||
106 | #ifdef CONFIG_TOSHIBA_JMR3927 | ||
107 | #include <asm/jmr3927/jmr3927.h> | ||
108 | #define TXX927_SERIAL_PORT_DEFNS \ | ||
109 | { .baud_base = JMR3927_BASE_BAUD, .port = UART0_ADDR, .irq = UART0_INT, \ | ||
110 | .flags = UART0_FLAGS, .type = 1 }, \ | ||
111 | { .baud_base = JMR3927_BASE_BAUD, .port = UART1_ADDR, .irq = UART1_INT, \ | ||
112 | .flags = UART1_FLAGS, .type = 1 }, | ||
113 | #else | ||
114 | #define TXX927_SERIAL_PORT_DEFNS | ||
115 | #endif | ||
116 | |||
117 | #ifdef CONFIG_SERIAL_AU1X00 | 106 | #ifdef CONFIG_SERIAL_AU1X00 |
118 | #include <asm/mach-au1x00/au1000.h> | 107 | #include <asm/mach-au1x00/au1000.h> |
119 | #ifdef CONFIG_SOC_AU1000 | 108 | #ifdef CONFIG_SOC_AU1000 |
@@ -343,7 +332,6 @@ | |||
343 | MOMENCO_OCELOT_C_SERIAL_PORT_DEFNS \ | 332 | MOMENCO_OCELOT_C_SERIAL_PORT_DEFNS \ |
344 | MOMENCO_OCELOT_SERIAL_PORT_DEFNS \ | 333 | MOMENCO_OCELOT_SERIAL_PORT_DEFNS \ |
345 | MOMENCO_OCELOT_3_SERIAL_PORT_DEFNS \ | 334 | MOMENCO_OCELOT_3_SERIAL_PORT_DEFNS \ |
346 | TXX927_SERIAL_PORT_DEFNS \ | ||
347 | AU1000_SERIAL_PORT_DEFNS | 335 | AU1000_SERIAL_PORT_DEFNS |
348 | 336 | ||
349 | #endif /* _ASM_SERIAL_H */ | 337 | #endif /* _ASM_SERIAL_H */ |