evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Magnus Damm 2012-05-02 21:47:00 +09:00 • committed by Greg Kroah-Hartman
parent cc419fa0d3
commit 6b4160313c
1 changed files with 26 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
drivers/tty/serial/8250/8250.c
View file

@ -297,24 +297,7 @@ static void default_dl_write(struct uart_8250_port *up, int value)
serial_out(up, UART_DLM, value >> 8 & 0xff); serial_out(up, UART_DLM, value >> 8 & 0xff);
} }
#if defined(CONFIG_MIPS_ALCHEMY) #if defined(CONFIG_SERIAL_8250_RM9K)
/* 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)
static int _serial_dl_read(struct uart_8250_port *up) static int _serial_dl_read(struct uart_8250_port *up)
{ {
return (up->port.iotype == UPIO_RM9000) ? return (up->port.iotype == UPIO_RM9000) ?
@ -344,7 +327,7 @@ static void _serial_dl_write(struct uart_8250_port *up, int value)
} }
#endif #endif
#if defined(CONFIG_MIPS_ALCHEMY) #ifdef CONFIG_MIPS_ALCHEMY
/* Au1x00 UART hardware has a weird register layout */ /* Au1x00 UART hardware has a weird register layout */
static const u8 au_io_in_map[] = { static const u8 au_io_in_map[] = {
@ -365,22 +348,32 @@ static const u8 au_io_out_map[] = {
[UART_MCR] = 6, [UART_MCR] = 6,
}; };
/* sane hardware needs no mapping */ static unsigned int au_serial_in(struct uart_port *p, int offset)
static inline int map_8250_in_reg(struct uart_port *p, int offset)
{ {
if (p->iotype != UPIO_AU) offset = au_io_in_map[offset] << p->regshift;
return offset; return __raw_readl(p->membase + offset);
return au_io_in_map[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) offset = au_io_out_map[offset] << p->regshift;
return offset; __raw_writel(value, p->membase + offset);
return au_io_out_map[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 static const u8
regmap_in[8] = { regmap_in[8] = {
@ -464,18 +457,6 @@ static unsigned int mem32_serial_in(struct uart_port *p, int offset)
return readl(p->membase + 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) static unsigned int io_serial_in(struct uart_port *p, int offset)
{ {
offset = map_8250_in_reg(p, offset) << p->regshift; 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; p->serial_out = mem32_serial_out;
break; break;
#ifdef CONFIG_MIPS_ALCHEMY
case UPIO_AU: case UPIO_AU:
p->serial_in = au_serial_in; p->serial_in = au_serial_in;
p->serial_out = au_serial_out; p->serial_out = au_serial_out;
up->dl_read = au_serial_dl_read;
up->dl_write = au_serial_dl_write;
break; break;
#endif
default: default:
p->serial_in = io_serial_in; p->serial_in = io_serial_in;