sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'serial' of git://www.denx.de/git/u-boot-microblaze

This commit is contained in:
Tom Rini 2014-05-06 14:55:45 -04:00
parent 33b0f7b5e6 870e0bda43
commit 173d294b94
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/serial/serial.c
View File

@ -117,7 +117,7 @@ serial_initfunc(ns16550_serial_initialize);
serial_initfunc(pxa_serial_initialize);
serial_initfunc(s3c24xx_serial_initialize);
serial_initfunc(s5p_serial_initialize);
serial_initfunc(zynq_serial_initalize);
serial_initfunc(zynq_serial_initialize);
serial_initfunc(bfin_serial_initialize);
serial_initfunc(bfin_jtag_initialize);
serial_initfunc(mpc512x_serial_initialize);
@ -214,7 +214,7 @@ void serial_initialize(void)
bfin_serial_initialize();
bfin_jtag_initialize();
uartlite_serial_initialize();
zynq_serial_initalize();
zynq_serial_initialize();
au1x00_serial_initialize();
asc_serial_initialize();
jz_serial_initialize();

18
drivers/serial/serial_zynq.c
View File

@ -153,17 +153,17 @@ static int uart_zynq_serial_getc(const int port)
/* Multi serial device functions */
#define DECLARE_PSSERIAL_FUNCTIONS(port) \
int uart_zynq##port##_init(void) \
static int uart_zynq##port##_init(void) \
{ return uart_zynq_serial_init(port); } \
void uart_zynq##port##_setbrg(void) \
static void uart_zynq##port##_setbrg(void) \
{ return uart_zynq_serial_setbrg(port); } \
int uart_zynq##port##_getc(void) \
static int uart_zynq##port##_getc(void) \
{ return uart_zynq_serial_getc(port); } \
int uart_zynq##port##_tstc(void) \
static int uart_zynq##port##_tstc(void) \
{ return uart_zynq_serial_tstc(port); } \
void uart_zynq##port##_putc(const char c) \
static void uart_zynq##port##_putc(const char c) \
{ uart_zynq_serial_putc(c, port); } \
void uart_zynq##port##_puts(const char *s) \
static void uart_zynq##port##_puts(const char *s) \
{ uart_zynq_serial_puts(s, port); }
/* Serial device descriptor */
@ -179,10 +179,10 @@ static int uart_zynq_serial_getc(const int port)
}
DECLARE_PSSERIAL_FUNCTIONS(0);
struct serial_device uart_zynq_serial0_device =
static struct serial_device uart_zynq_serial0_device =
INIT_PSSERIAL_STRUCTURE(0, "ttyPS0");
DECLARE_PSSERIAL_FUNCTIONS(1);
struct serial_device uart_zynq_serial1_device =
static struct serial_device uart_zynq_serial1_device =
INIT_PSSERIAL_STRUCTURE(1, "ttyPS1");
#ifdef CONFIG_OF_CONTROL
@ -223,7 +223,7 @@ __weak struct serial_device *default_serial_console(void)
}
#endif
void zynq_serial_initalize(void)
void zynq_serial_initialize(void)
{
serial_register(&uart_zynq_serial0_device);
serial_register(&uart_zynq_serial1_device);