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

Commit e735038f authored by Paul Mundt's avatar Paul Mundt
Browse files

serial: sh-sci: Kill off unused membase kludge. 



All users of the platform port data specify a mapbase where the driver
later derives the membase from. Now that UPF flags are taken in to
account for generic ioremapping we can kill off the port-specific membase
clobbering and simply use the generic paths.

This derives from a time when sh64 was not capable of using the generic
ioremap implementation and had employed early bolted DTLB mappings for
port access, which is no longer an issue.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 7c86ad4a

drivers/serial/sh-sci.c

+0 −4
Original line number Diff line number Diff line
@@ -1619,9 +1619,6 @@ static void sci_config_port(struct uart_port *port, int flags) 


	port->type = s->type;



	if (port->membase)

		return;



	if (port->flags & UPF_IOREMAP) {

		port->membase = ioremap_nocache(port->mapbase, 0x40);
@@ -1727,7 +1724,6 @@ static int __devinit sci_init_single(struct platform_device *dev, 
	init_timer(&sci_port->break_timer);



	port->mapbase	= p->mapbase;

	port->membase	= p->membase;



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

	port->flags		= p->flags;

include/linux/serial_sci.h

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ struct device; 
 * Platform device specific platform_data struct

 */

struct plat_sci_port {

	void __iomem	*membase;		/* io cookie */

	unsigned long	mapbase;		/* resource base */

	unsigned int	irqs[SCIx_NR_IRQS];	/* ERI, RXI, TXI, BRI */

	unsigned int	type;			/* SCI / SCIF / IRDA */