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

Commit 6b416031 authored by Magnus Damm's avatar Magnus Damm Committed by Greg Kroah-Hartman
Browse files

serial8250: Use dl_read()/dl_write() on Alchemy 



Convert the 8250 Alchemy support code to make
use of the new dl_read()/dl_write() callbacks.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cc419fa0

drivers/tty/serial/8250/8250.c

+26 −41
Original line number Diff line number Diff line
@@ -297,24 +297,7 @@ static void default_dl_write(struct uart_8250_port *up, int value) 
	serial_out(up, UART_DLM, value >> 8 & 0xff);

}



#if defined(CONFIG_MIPS_ALCHEMY)

/* Au1x00 haven't got a standard divisor latch */

static int _serial_dl_read(struct uart_8250_port *up)

{

	if (up->port.iotype == UPIO_AU)

		return __raw_readl(up->port.membase + 0x28);

	else

		return default_dl_read(up);

}



static void _serial_dl_write(struct uart_8250_port *up, int value)

{

	if (up->port.iotype == UPIO_AU)

		__raw_writel(value, up->port.membase + 0x28);

	else

		default_dl_write(up, value);

}

#elif defined(CONFIG_SERIAL_8250_RM9K)

#if defined(CONFIG_SERIAL_8250_RM9K)

static int _serial_dl_read(struct uart_8250_port *up)

{

	return	(up->port.iotype == UPIO_RM9000) ?
@@ -344,7 +327,7 @@ static void _serial_dl_write(struct uart_8250_port *up, int value) 
}

#endif



#if defined(CONFIG_MIPS_ALCHEMY)

#ifdef CONFIG_MIPS_ALCHEMY



/* Au1x00 UART hardware has a weird register layout */

static const u8 au_io_in_map[] = {
@@ -365,22 +348,32 @@ static const u8 au_io_out_map[] = { 
	[UART_MCR] = 6,

};



/* sane hardware needs no mapping */

static inline int map_8250_in_reg(struct uart_port *p, int offset)

static unsigned int au_serial_in(struct uart_port *p, int offset)

{

	if (p->iotype != UPIO_AU)

		return offset;

	return au_io_in_map[offset];

	offset = au_io_in_map[offset] << p->regshift;

	return __raw_readl(p->membase + offset);

}



static inline int map_8250_out_reg(struct uart_port *p, int offset)

static void au_serial_out(struct uart_port *p, int offset, int value)

{

	if (p->iotype != UPIO_AU)

		return offset;

	return au_io_out_map[offset];

	offset = au_io_out_map[offset] << p->regshift;

	__raw_writel(value, p->membase + offset);

}



#elif defined(CONFIG_SERIAL_8250_RM9K)

/* Au1x00 haven't got a standard divisor latch */

static int au_serial_dl_read(struct uart_8250_port *up)

{

	return __raw_readl(up->port.membase + 0x28);

}



static void au_serial_dl_write(struct uart_8250_port *up, int value)

{

	__raw_writel(value, up->port.membase + 0x28);

}



#endif



#if defined(CONFIG_SERIAL_8250_RM9K)



static const u8

	regmap_in[8] = {
@@ -464,18 +457,6 @@ static unsigned int mem32_serial_in(struct uart_port *p, int offset) 
	return readl(p->membase + offset);

}



static unsigned int au_serial_in(struct uart_port *p, int offset)

{

	offset = map_8250_in_reg(p, offset) << p->regshift;

	return __raw_readl(p->membase + offset);

}



static void au_serial_out(struct uart_port *p, int offset, int value)

{

	offset = map_8250_out_reg(p, offset) << p->regshift;

	__raw_writel(value, p->membase + offset);

}



static unsigned int io_serial_in(struct uart_port *p, int offset)

{

	offset = map_8250_in_reg(p, offset) << p->regshift;
@@ -515,10 +496,14 @@ static void set_io_from_upio(struct uart_port *p) 
		p->serial_out = mem32_serial_out;

		break;



#ifdef CONFIG_MIPS_ALCHEMY

	case UPIO_AU:

		p->serial_in = au_serial_in;

		p->serial_out = au_serial_out;

		up->dl_read = au_serial_dl_read;

		up->dl_write = au_serial_dl_write;

		break;

#endif



	default:

		p->serial_in = io_serial_in;