pl01x: use C structs and readl/writel
PATCH 1/1 pl01x: use C structs and readl/writel
Use C structs for registers, and use readl/writel instead of custom accessors.
Acked-by Michael Brandt <[email protected]>
Signed-off-by Rabin Vincent <[email protected]>
--- drivers/serial/serial_pl01x.c | 56 ++++++++++++++++++++++------------------ drivers/serial/serial_pl01x.h | 41 ++++++++++++++++-------------- 2 files changed, 53 insertions(+), 44 deletions(-)
drivers/serial/serial_pl01x.c +31 -25
@@ -29,12 +29,10 @@#include <common.h> #include <watchdog.h> +#include <asm/io.h> #include "serial_pl01x.h" -#define IO_WRITE (addr, val) (*(volatile unsigned int *)(addr) = (val)) -#define IO_READ (addr) (*(volatile unsigned int *)(addr)) -/* * Integrator AP has two UARTs, we use the first one, at 38400-8-N-1 * Integrator CP has two UARTs, use the first one, at 38400-8-N-1
@@ -49,16 +47,22 @@ static void pl01x_putc (int portnum, char c);static int pl01x_getc (int portnum);static int pl01x_tstc (int portnum); +static struct pl01x_regs *pl01x_get_regs (int portnum) +{ +return (struct pl01x_regs *) port[portnum]; +} +#ifdef CONFIG_PL010_SERIAL int serial_init (void ) { +struct pl01x_regs *regs =pl01x_get_regs (CONSOLE_PORT );unsigned int divisor;/* ** First, disable everything. */ -IO_WRITE (port[CONSOLE_PORT ] +UART_PL010_CR ,0x0 ); +writel (0 , ®s->pl010_cr);/* ** Set baud rate
@@ -89,20 +93,18 @@ int serial_init (void) divisor =UART_PL010_BAUD_38400 ; } -IO_WRITE (port[CONSOLE_PORT ] +UART_PL010_LCRM , - ((divisor &0xf00 ) >>8 )); -IO_WRITE (port[CONSOLE_PORT ] +UART_PL010_LCRL , (divisor &0xff )); +writel ((divisor &0xf00 ) >>8 , ®s->pl010_lcrm); +writel (divisor &0xff , ®s->pl010_lcrl);/* ** Set the UART to be 8 bits, 1 stop bit, no parity, fifo enabled. */ -IO_WRITE (port[CONSOLE_PORT ] +UART_PL010_LCRH , - (UART_PL010_LCRH_WLEN_8 |UART_PL010_LCRH_FEN )); +writel (UART_PL010_LCRH_WLEN_8 |UART_PL010_LCRH_FEN , ®s->pl010_lcrh);/* ** Finally, enable the UART */ -IO_WRITE (port[CONSOLE_PORT ] +UART_PL010_CR , (UART_PL010_CR_UARTEN )); +writel (UART_PL010_CR_UARTEN , ®s->pl010_cr);return 0 ; }
@@ -113,6 +115,7 @@ int serial_init (void)int serial_init (void ) { +struct pl01x_regs *regs =pl01x_get_regs (CONSOLE_PORT );unsigned int temp;unsigned int divider;unsigned int remainder;
@@ -121,7 +124,7 @@ int serial_init (void)/* ** First, disable everything. */ -IO_WRITE (port[CONSOLE_PORT ] +UART_PL011_CR ,0x0 ); +writel (0 , ®s->pl011_cr);/* ** Set baud rate
@@ -135,21 +138,20 @@ int serial_init (void) temp = (8 * remainder) / baudRate; fraction = (temp >>1 ) + (temp &1 ); -IO_WRITE (port[CONSOLE_PORT ] +UART_PL011_IBRD , divider); -IO_WRITE (port[CONSOLE_PORT ] +UART_PL011_FBRD , fraction); +writel (divider, ®s->pl011_ibrd); +writel (fraction, ®s->pl011_fbrd);/* ** Set the UART to be 8 bits, 1 stop bit, no parity, fifo enabled. */ -IO_WRITE (port[CONSOLE_PORT ] +UART_PL011_LCRH , - (UART_PL011_LCRH_WLEN_8 |UART_PL011_LCRH_FEN )); +writel (UART_PL011_LCRH_WLEN_8 |UART_PL011_LCRH_FEN , + ®s->pl011_lcrh);/* ** Finally, enable the UART */ -IO_WRITE (port[CONSOLE_PORT ] +UART_PL011_CR , - (UART_PL011_CR_UARTEN |UART_PL011_CR_TXE | -UART_PL011_CR_RXE )); +writel (UART_PL011_CR_UARTEN |UART_PL011_CR_TXE |UART_PL011_CR_RXE , + ®s->pl011_cr);return 0 ; }
@@ -187,28 +189,31 @@ void serial_setbrg (void)static void pl01x_putc (int portnum,char c) { +struct pl01x_regs *regs =pl01x_get_regs (portnum); +/* Wait until there is space in the FIFO */ -while (IO_READ (port[portnum] + UART_PL01x_FR) & UART_PL01x_FR_TXFF) +while (readl (®s->fr) & UART_PL01x_FR_TXFF)WATCHDOG_RESET ();/* Send the character */ -IO_WRITE (port[portnum] + UART_PL01x_DR, c); +writel (c, ®s->dr); }static int pl01x_getc (int portnum) { +struct pl01x_regs *regs =pl01x_get_regs (portnum);unsigned int data;/* Wait until there is data in the FIFO */ -while (IO_READ (port[portnum] + UART_PL01x_FR) & UART_PL01x_FR_RXFE) +while (readl (®s->fr) & UART_PL01x_FR_RXFE)WATCHDOG_RESET (); - data =IO_READ (port[portnum] + UART_PL01x_DR); + data =readl (®s->dr);/* Check for an error flag */ if (data &0xFFFFFF00 ) {/* Clear the error */ -IO_WRITE (port[portnum] + UART_PL01x_ECR,0xFFFFFFFF ); +writel (0xFFFFFFFF , ®s->ecr);return -1 ; }
@@ -217,7 +222,8 @@ static int pl01x_getc (int portnum)static int pl01x_tstc (int portnum) { +struct pl01x_regs *regs =pl01x_get_regs (portnum); +WATCHDOG_RESET (); -return !(IO_READ (port[portnum] + UART_PL01x_FR) & - UART_PL01x_FR_RXFE); +return !(readl (®s->fr) & UART_PL01x_FR_RXFE); }
drivers/serial/serial_pl01x.h +22 -19
59 lines not on this page · raw message
Signature · 1 line
1.7.0
Wolfgang Denk
AppliedPATCH 1/1 pl01x: use C structs and readl/writel
Dear Rabin Vincent,
Quoted 9 lines · In message <[email protected]>…
Use C structs for registers, and use readl/writel instead of custom accessors.
Acked-by Michael Brandt <[email protected]>Signed-off-by Rabin Vincent <[email protected]>--- drivers/serial/serial_pl01x.c | 56 ++++++++++++++++++++++------------------ drivers/serial/serial_pl01x.h | 41 ++++++++++++++++-------------- 2 files changed, 53 insertions(+), 44 deletions(-)
Applied, to "next". Thanks and sorry this took so long.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de I'm a soldier, not a diplomat. I can only tell the truth. -- Kirk, "Errand of Mercy", stardate 3198.9