aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/txx9/generic
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/txx9/generic')
-rw-r--r--arch/mips/txx9/generic/setup.c24
-rw-r--r--arch/mips/txx9/generic/setup_tx3927.c25
-rw-r--r--arch/mips/txx9/generic/setup_tx4927.c23
-rw-r--r--arch/mips/txx9/generic/setup_tx4938.c18
4 files changed, 41 insertions, 49 deletions
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index b136c6692a5f..94ce1a5c38a4 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -21,6 +21,7 @@
21#include <linux/err.h> 21#include <linux/err.h>
22#include <linux/gpio.h> 22#include <linux/gpio.h>
23#include <linux/platform_device.h> 23#include <linux/platform_device.h>
24#include <linux/serial_core.h>
24#include <asm/bootinfo.h> 25#include <asm/bootinfo.h>
25#include <asm/time.h> 26#include <asm/time.h>
26#include <asm/reboot.h> 27#include <asm/reboot.h>
@@ -247,6 +248,29 @@ void __init txx9_ethaddr_init(unsigned int id, unsigned char *ethaddr)
247 platform_device_put(pdev); 248 platform_device_put(pdev);
248} 249}
249 250
251void __init txx9_sio_init(unsigned long baseaddr, int irq,
252 unsigned int line, unsigned int sclk, int nocts)
253{
254#ifdef CONFIG_SERIAL_TXX9
255 struct uart_port req;
256
257 memset(&req, 0, sizeof(req));
258 req.line = line;
259 req.iotype = UPIO_MEM;
260 req.membase = ioremap(baseaddr, 0x24);
261 req.mapbase = baseaddr;
262 req.irq = irq;
263 if (!nocts)
264 req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;
265 if (sclk) {
266 req.flags |= UPF_MAGIC_MULTIPLIER /*USE_SCLK*/;
267 req.uartclk = sclk;
268 } else
269 req.uartclk = TXX9_IMCLK;
270 early_serial_txx9_setup(&req);
271#endif /* CONFIG_SERIAL_TXX9 */
272}
273
250/* wrappers */ 274/* wrappers */
251void __init plat_mem_setup(void) 275void __init plat_mem_setup(void)
252{ 276{
diff --git a/arch/mips/txx9/generic/setup_tx3927.c b/arch/mips/txx9/generic/setup_tx3927.c
index 0d09a0ff71e3..7bd963d37fc3 100644
--- a/arch/mips/txx9/generic/setup_tx3927.c
+++ b/arch/mips/txx9/generic/setup_tx3927.c
@@ -13,8 +13,8 @@
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/ioport.h> 14#include <linux/ioport.h>
15#include <linux/delay.h> 15#include <linux/delay.h>
16#include <linux/serial_core.h>
17#include <linux/param.h> 16#include <linux/param.h>
17#include <linux/io.h>
18#include <asm/mipsregs.h> 18#include <asm/mipsregs.h>
19#include <asm/txx9irq.h> 19#include <asm/txx9irq.h>
20#include <asm/txx9tmr.h> 20#include <asm/txx9tmr.h>
@@ -119,23 +119,12 @@ void __init tx3927_time_init(unsigned int evt_tmrnr, unsigned int src_tmrnr)
119 txx9_clocksource_init(TX3927_TMR_REG(src_tmrnr), TXX9_IMCLK); 119 txx9_clocksource_init(TX3927_TMR_REG(src_tmrnr), TXX9_IMCLK);
120} 120}
121 121
122void __init tx3927_setup_serial(unsigned int cts_mask) 122void __init tx3927_sio_init(unsigned int sclk, unsigned int cts_mask)
123{ 123{
124#ifdef CONFIG_SERIAL_TXX9
125 int i; 124 int i;
126 struct uart_port req; 125
127 126 for (i = 0; i < 2; i++)
128 for (i = 0; i < 2; i++) { 127 txx9_sio_init(TX3927_SIO_REG(i),
129 memset(&req, 0, sizeof(req)); 128 TXX9_IRQ_BASE + TX3927_IR_SIO(i),
130 req.line = i; 129 i, sclk, (1 << i) & cts_mask);
131 req.iotype = UPIO_MEM;
132 req.membase = (unsigned char __iomem *)TX3927_SIO_REG(i);
133 req.mapbase = TX3927_SIO_REG(i);
134 req.irq = TXX9_IRQ_BASE + TX3927_IR_SIO(i);
135 if (!((1 << i) & cts_mask))
136 req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;
137 req.uartclk = TXX9_IMCLK;
138 early_serial_txx9_setup(&req);
139 }
140#endif /* CONFIG_SERIAL_TXX9 */
141} 130}
diff --git a/arch/mips/txx9/generic/setup_tx4927.c b/arch/mips/txx9/generic/setup_tx4927.c
index b42c85573d0d..f80d4b7a694d 100644
--- a/arch/mips/txx9/generic/setup_tx4927.c
+++ b/arch/mips/txx9/generic/setup_tx4927.c
@@ -13,7 +13,6 @@
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/ioport.h> 14#include <linux/ioport.h>
15#include <linux/delay.h> 15#include <linux/delay.h>
16#include <linux/serial_core.h>
17#include <linux/param.h> 16#include <linux/param.h>
18#include <asm/txx9irq.h> 17#include <asm/txx9irq.h>
19#include <asm/txx9tmr.h> 18#include <asm/txx9tmr.h>
@@ -178,22 +177,12 @@ void __init tx4927_time_init(unsigned int tmrnr)
178 TXX9_IMCLK); 177 TXX9_IMCLK);
179} 178}
180 179
181void __init tx4927_setup_serial(void) 180void __init tx4927_sio_init(unsigned int sclk, unsigned int cts_mask)
182{ 181{
183#ifdef CONFIG_SERIAL_TXX9
184 int i; 182 int i;
185 struct uart_port req; 183
186 184 for (i = 0; i < 2; i++)
187 for (i = 0; i < 2; i++) { 185 txx9_sio_init(TX4927_SIO_REG(i) & 0xfffffffffULL,
188 memset(&req, 0, sizeof(req)); 186 TXX9_IRQ_BASE + TX4927_IR_SIO(i),
189 req.line = i; 187 i, sclk, (1 << i) & cts_mask);
190 req.iotype = UPIO_MEM;
191 req.membase = (unsigned char __iomem *)TX4927_SIO_REG(i);
192 req.mapbase = TX4927_SIO_REG(i) & 0xfffffffffULL;
193 req.irq = TXX9_IRQ_BASE + TX4927_IR_SIO(i);
194 req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;
195 req.uartclk = TXX9_IMCLK;
196 early_serial_txx9_setup(&req);
197 }
198#endif /* CONFIG_SERIAL_TXX9 */
199} 188}
diff --git a/arch/mips/txx9/generic/setup_tx4938.c b/arch/mips/txx9/generic/setup_tx4938.c
index 1ceace45ef6a..f3040b9ba059 100644
--- a/arch/mips/txx9/generic/setup_tx4938.c
+++ b/arch/mips/txx9/generic/setup_tx4938.c
@@ -13,7 +13,6 @@
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/ioport.h> 14#include <linux/ioport.h>
15#include <linux/delay.h> 15#include <linux/delay.h>
16#include <linux/serial_core.h>
17#include <linux/param.h> 16#include <linux/param.h>
18#include <asm/txx9irq.h> 17#include <asm/txx9irq.h>
19#include <asm/txx9tmr.h> 18#include <asm/txx9tmr.h>
@@ -238,11 +237,9 @@ void __init tx4938_time_init(unsigned int tmrnr)
238 TXX9_IMCLK); 237 TXX9_IMCLK);
239} 238}
240 239
241void __init tx4938_setup_serial(void) 240void __init tx4938_sio_init(unsigned int sclk, unsigned int cts_mask)
242{ 241{
243#ifdef CONFIG_SERIAL_TXX9
244 int i; 242 int i;
245 struct uart_port req;
246 unsigned int ch_mask = 0; 243 unsigned int ch_mask = 0;
247 244
248 if (__raw_readq(&tx4938_ccfgptr->pcfg) & TX4938_PCFG_ETH0_SEL) 245 if (__raw_readq(&tx4938_ccfgptr->pcfg) & TX4938_PCFG_ETH0_SEL)
@@ -250,17 +247,10 @@ void __init tx4938_setup_serial(void)
250 for (i = 0; i < 2; i++) { 247 for (i = 0; i < 2; i++) {
251 if ((1 << i) & ch_mask) 248 if ((1 << i) & ch_mask)
252 continue; 249 continue;
253 memset(&req, 0, sizeof(req)); 250 txx9_sio_init(TX4938_SIO_REG(i) & 0xfffffffffULL,
254 req.line = i; 251 TXX9_IRQ_BASE + TX4938_IR_SIO(i),
255 req.iotype = UPIO_MEM; 252 i, sclk, (1 << i) & cts_mask);
256 req.membase = (unsigned char __iomem *)TX4938_SIO_REG(i);
257 req.mapbase = TX4938_SIO_REG(i) & 0xfffffffffULL;
258 req.irq = TXX9_IRQ_BASE + TX4938_IR_SIO(i);
259 req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;
260 req.uartclk = TXX9_IMCLK;
261 early_serial_txx9_setup(&req);
262 } 253 }
263#endif /* CONFIG_SERIAL_TXX9 */
264} 254}
265 255
266void __init tx4938_spi_init(int busid) 256void __init tx4938_spi_init(int busid)