Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7779a5e0 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

[MIPS] TXx9: Unify serial_txx9 setup 



* Unify calling of early_serial_txx9_setup.
* Use dedicated serial clock on RBTX4938.

Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent bb72f1f7

arch/mips/txx9/generic/setup.c

+24 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/err.h>

#include <linux/err.h>

#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/serial_core.h>

#include <asm/bootinfo.h>

#include <asm/bootinfo.h>

#include <asm/time.h>

#include <asm/time.h>

#include <asm/reboot.h>

#include <asm/reboot.h>
@@ -247,6 +248,29 @@ void __init txx9_ethaddr_init(unsigned int id, unsigned char *ethaddr) 
		platform_device_put(pdev);

		platform_device_put(pdev);

}

}





void __init txx9_sio_init(unsigned long baseaddr, int irq,

			  unsigned int line, unsigned int sclk, int nocts)

{

#ifdef CONFIG_SERIAL_TXX9

	struct uart_port req;



	memset(&req, 0, sizeof(req));

	req.line = line;

	req.iotype = UPIO_MEM;

	req.membase = ioremap(baseaddr, 0x24);

	req.mapbase = baseaddr;

	req.irq = irq;

	if (!nocts)

		req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;

	if (sclk) {

		req.flags |= UPF_MAGIC_MULTIPLIER /*USE_SCLK*/;

		req.uartclk = sclk;

	} else

		req.uartclk = TXX9_IMCLK;

	early_serial_txx9_setup(&req);

#endif /* CONFIG_SERIAL_TXX9 */

}



/* wrappers */

/* wrappers */

void __init plat_mem_setup(void)

void __init plat_mem_setup(void)

{

{

arch/mips/txx9/generic/setup_tx3927.c

+7 −18
Original line number Original line Diff line number Diff line
@@ -13,8 +13,8 @@ 
#include <linux/init.h>

#include <linux/init.h>

#include <linux/ioport.h>

#include <linux/ioport.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/serial_core.h>

#include <linux/param.h>

#include <linux/param.h>

#include <linux/io.h>

#include <asm/mipsregs.h>

#include <asm/mipsregs.h>

#include <asm/txx9irq.h>

#include <asm/txx9irq.h>

#include <asm/txx9tmr.h>

#include <asm/txx9tmr.h>
@@ -119,23 +119,12 @@ void __init tx3927_time_init(unsigned int evt_tmrnr, unsigned int src_tmrnr) 
	txx9_clocksource_init(TX3927_TMR_REG(src_tmrnr), TXX9_IMCLK);

	txx9_clocksource_init(TX3927_TMR_REG(src_tmrnr), TXX9_IMCLK);

}

}





void __init tx3927_setup_serial(unsigned int cts_mask)

void __init tx3927_sio_init(unsigned int sclk, unsigned int cts_mask)

{

{

#ifdef CONFIG_SERIAL_TXX9

	int i;

	int i;

	struct uart_port req;





	for (i = 0; i < 2; i++)

	for (i = 0; i < 2; i++) {

		txx9_sio_init(TX3927_SIO_REG(i),

		memset(&req, 0, sizeof(req));

			      TXX9_IRQ_BASE + TX3927_IR_SIO(i),

		req.line = i;

			      i, sclk, (1 << i) & cts_mask);

		req.iotype = UPIO_MEM;

		req.membase = (unsigned char __iomem *)TX3927_SIO_REG(i);

		req.mapbase = TX3927_SIO_REG(i);

		req.irq = TXX9_IRQ_BASE + TX3927_IR_SIO(i);

		if (!((1 << i) & cts_mask))

			req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;

		req.uartclk = TXX9_IMCLK;

		early_serial_txx9_setup(&req);

	}

#endif /* CONFIG_SERIAL_TXX9 */

}
 
}

arch/mips/txx9/generic/setup_tx4927.c

+6 −17
Original line number Original line Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/init.h>

#include <linux/init.h>

#include <linux/ioport.h>

#include <linux/ioport.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/serial_core.h>

#include <linux/param.h>

#include <linux/param.h>

#include <asm/txx9irq.h>

#include <asm/txx9irq.h>

#include <asm/txx9tmr.h>

#include <asm/txx9tmr.h>
@@ -178,22 +177,12 @@ void __init tx4927_time_init(unsigned int tmrnr) 
				     TXX9_IMCLK);

				     TXX9_IMCLK);

}

}





void __init tx4927_setup_serial(void)

void __init tx4927_sio_init(unsigned int sclk, unsigned int cts_mask)

{

{

#ifdef CONFIG_SERIAL_TXX9

	int i;

	int i;

	struct uart_port req;





	for (i = 0; i < 2; i++)

	for (i = 0; i < 2; i++) {

		txx9_sio_init(TX4927_SIO_REG(i) & 0xfffffffffULL,

		memset(&req, 0, sizeof(req));

			      TXX9_IRQ_BASE + TX4927_IR_SIO(i),

		req.line = i;

			      i, sclk, (1 << i) & cts_mask);

		req.iotype = UPIO_MEM;

		req.membase = (unsigned char __iomem *)TX4927_SIO_REG(i);

		req.mapbase = TX4927_SIO_REG(i) & 0xfffffffffULL;

		req.irq = TXX9_IRQ_BASE + TX4927_IR_SIO(i);

		req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;

		req.uartclk = TXX9_IMCLK;

		early_serial_txx9_setup(&req);

	}

#endif /* CONFIG_SERIAL_TXX9 */

}
 
}

arch/mips/txx9/generic/setup_tx4938.c

+4 −14
Original line number Original line Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/init.h>

#include <linux/init.h>

#include <linux/ioport.h>

#include <linux/ioport.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/serial_core.h>

#include <linux/param.h>

#include <linux/param.h>

#include <asm/txx9irq.h>

#include <asm/txx9irq.h>

#include <asm/txx9tmr.h>

#include <asm/txx9tmr.h>
@@ -238,11 +237,9 @@ void __init tx4938_time_init(unsigned int tmrnr) 
				     TXX9_IMCLK);

				     TXX9_IMCLK);

}

}





void __init tx4938_setup_serial(void)

void __init tx4938_sio_init(unsigned int sclk, unsigned int cts_mask)

{

{

#ifdef CONFIG_SERIAL_TXX9

	int i;

	int i;

	struct uart_port req;

	unsigned int ch_mask = 0;

	unsigned int ch_mask = 0;





	if (__raw_readq(&tx4938_ccfgptr->pcfg) & TX4938_PCFG_ETH0_SEL)

	if (__raw_readq(&tx4938_ccfgptr->pcfg) & TX4938_PCFG_ETH0_SEL)
@@ -250,17 +247,10 @@ void __init tx4938_setup_serial(void) 
	for (i = 0; i < 2; i++) {

	for (i = 0; i < 2; i++) {

		if ((1 << i) & ch_mask)

		if ((1 << i) & ch_mask)

			continue;

			continue;

		memset(&req, 0, sizeof(req));

		txx9_sio_init(TX4938_SIO_REG(i) & 0xfffffffffULL,

		req.line = i;

			      TXX9_IRQ_BASE + TX4938_IR_SIO(i),

		req.iotype = UPIO_MEM;

			      i, sclk, (1 << i) & cts_mask);

		req.membase = (unsigned char __iomem *)TX4938_SIO_REG(i);

		req.mapbase = TX4938_SIO_REG(i) & 0xfffffffffULL;

		req.irq = TXX9_IRQ_BASE + TX4938_IR_SIO(i);

		req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;

		req.uartclk = TXX9_IMCLK;

		early_serial_txx9_setup(&req);

	}

	}

#endif /* CONFIG_SERIAL_TXX9 */

}

}





void __init tx4938_spi_init(int busid)

void __init tx4938_spi_init(int busid)

arch/mips/txx9/jmr3927/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -105,7 +105,7 @@ static void __init jmr3927_mem_setup(void) 
	/* initialize board */

	/* initialize board */

	jmr3927_board_init();

	jmr3927_board_init();





	tx3927_setup_serial(1 << 1); /* ch1: noCTS */

	tx3927_sio_init(0, 1 << 1); /* ch1: noCTS */

#ifdef CONFIG_SERIAL_TXX9_CONSOLE

#ifdef CONFIG_SERIAL_TXX9_CONSOLE

	argptr = prom_getcmdline();

	argptr = prom_getcmdline();

	if (!strstr(argptr, "console="))

	if (!strstr(argptr, "console="))