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

Commit 7ed7e071 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

sh-sci: replace sci_init_ports() 



Replace sci_init_ports() with sci_init_single().

Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 0ee70712

drivers/serial/sh-sci.c

+50 −57
Original line number Diff line number Diff line
@@ -1036,48 +1036,66 @@ static struct uart_ops sci_uart_ops = { 
#endif

};



static void __init sci_init_ports(void)

static int __devinit sci_init_single(struct sci_port *sci_port,

				     unsigned int index,

				     struct plat_sci_port *p)

{

	static int first = 1;

	int i;



	if (!first)

		return;



	first = 0;



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

		sci_ports[i].port.ops		= &sci_uart_ops;

		sci_ports[i].port.iotype	= UPIO_MEM;

		sci_ports[i].port.line		= i;

		sci_ports[i].port.fifosize	= 1;

	sci_port->port.ops	= &sci_uart_ops;

	sci_port->port.iotype	= UPIO_MEM;

	sci_port->port.line	= index;

	sci_port->port.fifosize	= 1;



#if defined(__H8300H__) || defined(__H8300S__)

#ifdef __H8300S__

		sci_ports[i].enable	= h8300_sci_enable;

		sci_ports[i].disable	= h8300_sci_disable;

	sci_port->enable	= h8300_sci_enable;

	sci_port->disable	= h8300_sci_disable;

#endif

		sci_ports[i].port.uartclk = CONFIG_CPU_CLOCK;

	sci_port->port.uartclk	= CONFIG_CPU_CLOCK;

#elif defined(CONFIG_HAVE_CLK)

	/*

	 * XXX: We should use a proper SCI/SCIF clock

	 */

	{

		struct clk *clk = clk_get(NULL, "module_clk");

			sci_ports[i].port.uartclk = clk_get_rate(clk);

		sci_port->port.uartclk = clk_get_rate(clk);

		clk_put(clk);

	}

#else

#error "Need a valid uartclk"

#endif



		sci_ports[i].break_timer.data = (unsigned long)&sci_ports[i];

		sci_ports[i].break_timer.function = sci_break_timer;

	sci_port->break_timer.data = (unsigned long)sci_port;

	sci_port->break_timer.function = sci_break_timer;

	init_timer(&sci_port->break_timer);



		init_timer(&sci_ports[i].break_timer);

	sci_port->port.mapbase	= p->mapbase;



	if (p->mapbase && !p->membase) {

		if (p->flags & UPF_IOREMAP) {

			p->membase = ioremap_nocache(p->mapbase, 0x40);

			if (IS_ERR(p->membase))

				return PTR_ERR(p->membase);

		} else {

			/*

			 * For the simple (and majority of) cases

			 * where we don't need to do any remapping,

			 * just cast the cookie directly.

			 */

			p->membase = (void __iomem *)p->mapbase;

		}

	}



	sci_port->port.membase	= p->membase;



	sci_port->port.irq	= p->irqs[SCIx_TXI_IRQ];

	sci_port->port.flags	= p->flags;

	sci_port->type		= sci_port->port.type = p->type;



	memcpy(&sci_port->irqs, &p->irqs, sizeof(p->irqs));



	return 0;

}



#ifdef CONFIG_SERIAL_SH_SCI_CONSOLE

static struct tty_driver *serial_console_device(struct console *co, int *index)

{
@@ -1174,7 +1192,6 @@ static struct console serial_console = { 


static int __init sci_console_init(void)

{

	sci_init_ports();

	register_console(&serial_console);

	return 0;

}
@@ -1240,32 +1257,10 @@ static int __devinit sci_probe_single(struct platform_device *dev, 
		return 0;

	}



	sciport->port.mapbase	= p->mapbase;



	if (p->mapbase && !p->membase) {

		if (p->flags & UPF_IOREMAP) {

			p->membase = ioremap_nocache(p->mapbase, 0x40);

			if (IS_ERR(p->membase))

				return PTR_ERR(p->membase);

		} else {

			/*

			 * For the simple (and majority of) cases

			 * where we don't need to do any remapping,

			 * just cast the cookie directly.

			 */

			p->membase = (void __iomem *)p->mapbase;

		}

	}



	sciport->port.membase	= p->membase;



	sciport->port.irq	= p->irqs[SCIx_TXI_IRQ];

	sciport->port.flags	= p->flags;

	sciport->port.dev = &dev->dev;



	sciport->type		= sciport->port.type = p->type;



	memcpy(&sciport->irqs, &p->irqs, sizeof(p->irqs));

	ret = sci_init_single(sciport, index, p);

	if (ret)

		return ret;



	ret = uart_add_one_port(&sci_uart_driver, &sciport->port);
@@ -1380,8 +1375,6 @@ static int __init sci_init(void) 


	printk(banner);



	sci_init_ports();



	ret = uart_register_driver(&sci_uart_driver);

	if (likely(ret == 0)) {

		ret = platform_driver_register(&sci_driver);