Eric Lee / smarc-uboot | Embedian Git Server

Commit 194846f398ef38d5e24c239d264a3f637c685e53

Authored by Michal Simek 2012-09-14 08:55:24 +0800

Committed by Albert ARIBAUD 2012-10-04 22:46:18 +0800

Exists in master and in 54 other branches

serial: Add Zynq serial driver

The driver is used on Xilinx Zynq platform.

Signed-off-by: Michal Simek <monstr@monstr.eu>
CC: Joe Hershberger <joe.hershberger@gmail.com>
CC: Marek Vasut <marex@denx.de>
Acked-by: Marek Vasut <marex@denx.de>

Showing 4 changed files with 261 additions and 0 deletions Inline Diff

common/serial.c
drivers/serial/Makefile
drivers/serial/serial_zynq.c
include/serial.h

common/serial.c

Diff comments View file @ 194846f

 /*
  * (C) Copyright 2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
  */
 #include <common.h>
 #include <serial.h>
 #include <stdio_dev.h>
 #include <post.h>
 #include <linux/compiler.h>
 DECLARE_GLOBAL_DATA_PTR;
 static struct serial_device *serial_devices;
 static struct serial_device *serial_current;
 void serial_register(struct serial_device *dev)
 {
 #ifdef CONFIG_NEEDS_MANUAL_RELOC
 	dev->init += gd->reloc_off;
 	dev->setbrg += gd->reloc_off;
 	dev->getc += gd->reloc_off;
 	dev->tstc += gd->reloc_off;
 	dev->putc += gd->reloc_off;
 	dev->puts += gd->reloc_off;
 #endif
 	dev->next = serial_devices;
 	serial_devices = dev;
 }
 void serial_initialize(void)
 {
 #if defined(CONFIG_8xx_CONS_SMC1) || defined(CONFIG_8xx_CONS_SMC2)
 	serial_register(&serial_smc_device);
 #endif
 #if	defined(CONFIG_8xx_CONS_SCC1) || defined(CONFIG_8xx_CONS_SCC2) || \
 	defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4)
 	serial_register(&serial_scc_device);
 #endif
 #if defined(CONFIG_SYS_NS16550_SERIAL)
 #if defined(CONFIG_SYS_NS16550_COM1)
 	serial_register(&eserial1_device);
 #endif
 #if defined(CONFIG_SYS_NS16550_COM2)
 	serial_register(&eserial2_device);
 #endif
 #if defined(CONFIG_SYS_NS16550_COM3)
 	serial_register(&eserial3_device);
 #endif
 #if defined(CONFIG_SYS_NS16550_COM4)
 	serial_register(&eserial4_device);
 #endif
 #endif /* CONFIG_SYS_NS16550_SERIAL */
 #if defined(CONFIG_FFUART)
 	serial_register(&serial_ffuart_device);
 #endif
 #if defined(CONFIG_BTUART)
 	serial_register(&serial_btuart_device);
 #endif
 #if defined(CONFIG_STUART)
 	serial_register(&serial_stuart_device);
 #endif
 #if defined(CONFIG_S3C2410)
 	serial_register(&s3c24xx_serial0_device);
 	serial_register(&s3c24xx_serial1_device);
 	serial_register(&s3c24xx_serial2_device);
 #endif
 #if defined(CONFIG_S5P)
 	serial_register(&s5p_serial0_device);
 	serial_register(&s5p_serial1_device);
 	serial_register(&s5p_serial2_device);
 	serial_register(&s5p_serial3_device);
 #endif
 #if defined(CONFIG_MPC512X)
 #if defined(CONFIG_SYS_PSC1)
 	serial_register(&serial1_device);
 #endif
 #if defined(CONFIG_SYS_PSC3)
 	serial_register(&serial3_device);
 #endif
 #if defined(CONFIG_SYS_PSC4)
 	serial_register(&serial4_device);
 #endif
 #if defined(CONFIG_SYS_PSC6)
 	serial_register(&serial6_device);
 #endif
 #endif
 #if defined(CONFIG_SYS_BFIN_UART)
 	serial_register_bfin_uart();
 #endif
 #if defined(CONFIG_XILINX_UARTLITE)
 # ifdef XILINX_UARTLITE_BASEADDR
 	serial_register(&uartlite_serial0_device);
 # endif /* XILINX_UARTLITE_BASEADDR */
 # ifdef XILINX_UARTLITE_BASEADDR1
 	serial_register(&uartlite_serial1_device);
 # endif /* XILINX_UARTLITE_BASEADDR1 */
 # ifdef XILINX_UARTLITE_BASEADDR2
 	serial_register(&uartlite_serial2_device);
 # endif /* XILINX_UARTLITE_BASEADDR2 */
 # ifdef XILINX_UARTLITE_BASEADDR3
 	serial_register(&uartlite_serial3_device);
 # endif /* XILINX_UARTLITE_BASEADDR3 */
 #endif /* CONFIG_XILINX_UARTLITE */
+#if defined(CONFIG_ZYNQ_SERIAL)
+# ifdef CONFIG_ZYNQ_SERIAL_BASEADDR0
+	serial_register(&uart_zynq_serial0_device);
+# endif
+# ifdef CONFIG_ZYNQ_SERIAL_BASEADDR1
+	serial_register(&uart_zynq_serial1_device);
+# endif
+#endif
 	serial_assign(default_serial_console()->name);
 }
 void serial_stdio_init(void)
 {
 	struct stdio_dev dev;
 	struct serial_device *s = serial_devices;
 	while (s) {
 		memset(&dev, 0, sizeof(dev));
 		strcpy(dev.name, s->name);
 		dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
 		dev.start = s->init;
 		dev.stop = s->uninit;
 		dev.putc = s->putc;
 		dev.puts = s->puts;
 		dev.getc = s->getc;
 		dev.tstc = s->tstc;
 		stdio_register(&dev);
 		s = s->next;
 	}
 }
 int serial_assign(const char *name)
 {
 	struct serial_device *s;
 	for (s = serial_devices; s; s = s->next) {
 		if (strcmp(s->name, name) == 0) {
 			serial_current = s;
 			return 0;
 		}
 	}
 	return 1;
 }
 void serial_reinit_all(void)
 {
 	struct serial_device *s;
 	for (s = serial_devices; s; s = s->next)
 		s->init();
 }
 static struct serial_device *get_current(void)
 {
 	struct serial_device *dev;
 	if (!(gd->flags & GD_FLG_RELOC) || !serial_current) {
 		dev = default_serial_console();
 		/* We must have a console device */
 		if (!dev)
 			panic("Cannot find console");
 	} else
 		dev = serial_current;
 	return dev;
 }
 int serial_init(void)
 {
 	return get_current()->init();
 }
 void serial_setbrg(void)
 {
 	get_current()->setbrg();
 }
 int serial_getc(void)
 {
 	return get_current()->getc();
 }
 int serial_tstc(void)
 {
 	return get_current()->tstc();
 }
 void serial_putc(const char c)
 {
 	get_current()->putc(c);
 }
 void serial_puts(const char *s)
 {
 	get_current()->puts(s);
 }
 #if CONFIG_POST & CONFIG_SYS_POST_UART
 static const int bauds[] = CONFIG_SYS_BAUDRATE_TABLE;
 /* Mark weak until post/cpu/.../uart.c migrate over */
 __weak
 int uart_post_test(int flags)
 {
 	unsigned char c;
 	int ret, saved_baud, b;
 	struct serial_device *saved_dev, *s;
 	bd_t *bd = gd->bd;
 	/* Save current serial state */
 	ret = 0;
 	saved_dev = serial_current;
 	saved_baud = bd->bi_baudrate;
 	for (s = serial_devices; s; s = s->next) {
 		/* If this driver doesn't support loop back, skip it */
 		if (!s->loop)
 			continue;
 		/* Test the next device */
 		serial_current = s;
 		ret = serial_init();
 		if (ret)
 			goto done;
 		/* Consume anything that happens to be queued */
 		while (serial_tstc())
 			serial_getc();
 		/* Enable loop back */
 		s->loop(1);
 		/* Test every available baud rate */
 		for (b = 0; b < ARRAY_SIZE(bauds); ++b) {
 			bd->bi_baudrate = bauds[b];
 			serial_setbrg();
 			/*
 			 * Stick to printable chars to avoid issues:
 			 *  - terminal corruption
 			 *  - serial program reacting to sequences and sending
 			 *    back random extra data
 			 *  - most serial drivers add in extra chars (like \r\n)
 			 */
 			for (c = 0x20; c < 0x7f; ++c) {
 				/* Send it out */
 				serial_putc(c);
 				/* Make sure it's the same one */
 				ret = (c != serial_getc());
 				if (ret) {
 					s->loop(0);
 					goto done;
 				}
 				/* Clean up the output in case it was sent */
 				serial_putc('\b');
 				ret = ('\b' != serial_getc());
 				if (ret) {
 					s->loop(0);
 					goto done;
 				}
 			}
 		}
 		/* Disable loop back */
 		s->loop(0);
 		/* XXX: There is no serial_uninit() !? */
 		if (s->uninit)
 			s->uninit();
 	}
  done:
 	/* Restore previous serial state */
 	serial_current = saved_dev;
 	bd->bi_baudrate = saved_baud;
 	serial_reinit_all();
 	serial_setbrg();
 	return ret;
 }
 #endif

drivers/serial/Makefile

Diff comments View file @ 194846f

 #
 # (C) Copyright 2006-2009
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
 # See file CREDITS for list of people who contributed to this
 # project.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
 # published by the Free Software Foundation; either version 2 of
 # the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #
 include $(TOPDIR)/config.mk
 LIB	:= $(obj)libserial.o
 COBJS-$(CONFIG_ALTERA_UART) += altera_uart.o
 COBJS-$(CONFIG_ALTERA_JTAG_UART) += altera_jtag_uart.o
 COBJS-$(CONFIG_ARM_DCC) += arm_dcc.o
 COBJS-$(CONFIG_ATMEL_USART) += atmel_usart.o
 COBJS-$(CONFIG_LPC32XX_HSUART) += lpc32xx_hsuart.o
 COBJS-$(CONFIG_MCFUART) += mcfuart.o
 COBJS-$(CONFIG_NS9750_UART) += ns9750_serial.o
 COBJS-$(CONFIG_OPENCORES_YANU) += opencores_yanu.o
 COBJS-$(CONFIG_SYS_NS16550) += ns16550.o
 COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o
 COBJS-$(CONFIG_S3C64XX) += s3c64xx.o
 COBJS-$(CONFIG_S5P) += serial_s5p.o
 COBJS-$(CONFIG_SYS_NS16550_SERIAL) += serial.o
 COBJS-$(CONFIG_CLPS7111_SERIAL) += serial_clps7111.o
 COBJS-$(CONFIG_IMX_SERIAL) += serial_imx.o
 COBJS-$(CONFIG_IXP_SERIAL) += serial_ixp.o
 COBJS-$(CONFIG_KS8695_SERIAL) += serial_ks8695.o
 COBJS-$(CONFIG_LPC2292_SERIAL) += serial_lpc2292.o
 COBJS-$(CONFIG_LH7A40X_SERIAL) += serial_lh7a40x.o
 COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
 COBJS-$(CONFIG_MXC_UART) += serial_mxc.o
 COBJS-$(CONFIG_NETARM_SERIAL) += serial_netarm.o
 COBJS-$(CONFIG_PL010_SERIAL) += serial_pl01x.o
 COBJS-$(CONFIG_PL011_SERIAL) += serial_pl01x.o
 COBJS-$(CONFIG_PXA_SERIAL) += serial_pxa.o
 COBJS-$(CONFIG_SA1100_SERIAL) += serial_sa1100.o
 COBJS-$(CONFIG_S3C24X0_SERIAL) += serial_s3c24x0.o
 COBJS-$(CONFIG_S3C44B0_SERIAL) += serial_s3c44b0.o
 COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o
 COBJS-$(CONFIG_SANDBOX_SERIAL) += sandbox.o
 COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o
+COBJS-$(CONFIG_ZYNQ_SERIAL) += serial_zynq.o
 ifndef CONFIG_SPL_BUILD
 COBJS-$(CONFIG_USB_TTY) += usbtty.o
 endif
 COBJS	:= $(sort $(COBJS-y))
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 all:	$(LIB)
 $(LIB):	$(obj).depend $(OBJS)
 	$(call cmd_link_o_target, $(OBJS))
 #########################################################################
 # defines $(obj).depend target
 include $(SRCTREE)/rules.mk
 sinclude $(obj).depend
 #########################################################################

drivers/serial/serial_zynq.c

Diff comments View file @ 194846f

File was created	1	/*
	2	* Copyright (C) 2012 Michal Simek <monstr@monstr.eu>
	3	* Copyright (C) 2011-2012 Xilinx, Inc. All rights reserved.
	4	*
	5	* See file CREDITS for list of people who contributed to this
	6	* project.
	7	*
	8	* This program is free software; you can redistribute it and/or
	9	* modify it under the terms of the GNU General Public License as
	10	* published by the Free Software Foundation; either version 2 of
	11	* the License, or (at your option) any later version.
	12	*
	13	* This program is distributed in the hope that it will be useful,
	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	16	* GNU General Public License for more details.
	17	*
	18	* You should have received a copy of the GNU General Public License
	19	* along with this program; if not, write to the Free Software
	20	* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
	21	* MA 02111-1307 USA
	22	*/
	23
	24	#include <common.h>
	25	#include <watchdog.h>
	26	#include <asm/io.h>
	27	#include <linux/compiler.h>
	28	#include <serial.h>
	29
	30	#define ZYNQ_UART_SR_TXFULL 0x00000010 /* TX FIFO full */
	31	#define ZYNQ_UART_SR_RXEMPTY 0x00000002 /* RX FIFO empty */
	32
	33	#define ZYNQ_UART_CR_TX_EN 0x00000010 /* TX enabled */
	34	#define ZYNQ_UART_CR_RX_EN 0x00000004 /* RX enabled */
	35	#define ZYNQ_UART_CR_TXRST 0x00000002 /* TX logic reset */
	36	#define ZYNQ_UART_CR_RXRST 0x00000001 /* RX logic reset */
	37
	38	#define ZYNQ_UART_MR_PARITY_NONE 0x00000020 /* No parity mode */
	39
	40	/* Some clock/baud constants */
	41	#define ZYNQ_UART_BDIV 15 /* Default/reset BDIV value */
	42	#define ZYNQ_UART_BASECLK 3125000L /* master / (bdiv + 1) */
	43
	44	struct uart_zynq {
	45	u32 control; /* Control Register [8:0] */
	46	u32 mode; /* Mode Register [10:0] */
	47	u32 reserved1[4];
	48	u32 baud_rate_gen; /* Baud Rate Generator [15:0] */
	49	u32 reserved2[4];
	50	u32 channel_sts; /* Channel Status [11:0] */
	51	u32 tx_rx_fifo; /* FIFO [15:0] or [7:0] */
	52	u32 baud_rate_divider; /* Baud Rate Divider [7:0] */
	53	};
	54
	55	static struct uart_zynq *uart_zynq_ports[2] = {
	56	#ifdef CONFIG_ZYNQ_SERIAL_BASEADDR0
	57	[0] = (struct uart_zynq *)CONFIG_ZYNQ_SERIAL_BASEADDR0,
	58	#endif
	59	#ifdef CONFIG_ZYNQ_SERIAL_BASEADDR1
	60	[1] = (struct uart_zynq *)CONFIG_ZYNQ_SERIAL_BASEADDR1,
	61	#endif
	62	};
	63
	64	struct uart_zynq_params {
	65	u32 baudrate;
	66	u32 clock;
	67	};
	68
	69	static struct uart_zynq_params uart_zynq_ports_param[2] = {
	70	#if defined(CONFIG_ZYNQ_SERIAL_BAUDRATE0) && defined(CONFIG_ZYNQ_SERIAL_CLOCK0)
	71	[0].baudrate = CONFIG_ZYNQ_SERIAL_BAUDRATE0,
	72	[0].clock = CONFIG_ZYNQ_SERIAL_CLOCK0,
	73	#endif
	74	#if defined(CONFIG_ZYNQ_SERIAL_BAUDRATE1) && defined(CONFIG_ZYNQ_SERIAL_CLOCK1)
	75	[1].baudrate = CONFIG_ZYNQ_SERIAL_BAUDRATE1,
	76	[1].clock = CONFIG_ZYNQ_SERIAL_CLOCK1,
	77	#endif
	78	};
	79
	80	/* Set up the baud rate in gd struct */
	81	static void uart_zynq_serial_setbrg(const int port)
	82	{
	83	/* Calculation results. */
	84	unsigned int calc_bauderror, bdiv, bgen;
	85	unsigned long calc_baud = 0;
	86	unsigned long baud = uart_zynq_ports_param[port].baudrate;
	87	unsigned long clock = uart_zynq_ports_param[port].clock;
	88	struct uart_zynq *regs = uart_zynq_ports[port];
	89
	90	/* master clock
	91	* Baud rate = ------------------
	92	* bgen * (bdiv + 1)
	93	*
	94	* Find acceptable values for baud generation.
	95	*/
	96	for (bdiv = 4; bdiv < 255; bdiv++) {
	97	bgen = clock / (baud * (bdiv + 1));
	98	if (bgen < 2 \|\| bgen > 65535)
	99	continue;
	100
	101	calc_baud = clock / (bgen * (bdiv + 1));
	102
	103	/*
	104	* Use first calculated baudrate with
	105	* an acceptable (<3%) error
	106	*/
	107	if (baud > calc_baud)
	108	calc_bauderror = baud - calc_baud;
	109	else
	110	calc_bauderror = calc_baud - baud;
	111	if (((calc_bauderror * 100) / baud) < 3)
	112	break;
	113	}
	114
	115	writel(bdiv, &regs->baud_rate_divider);
	116	writel(bgen, &regs->baud_rate_gen);
	117	}
	118
	119	/* Initialize the UART, with...some settings. */
	120	static int uart_zynq_serial_init(const int port)
	121	{
	122	struct uart_zynq *regs = uart_zynq_ports[port];
	123
	124	if (!regs)
	125	return -1;
	126
	127	/* RX/TX enabled & reset */
	128	writel(ZYNQ_UART_CR_TX_EN \| ZYNQ_UART_CR_RX_EN \| ZYNQ_UART_CR_TXRST \| \
	129	ZYNQ_UART_CR_RXRST, &regs->control);
	130	writel(ZYNQ_UART_MR_PARITY_NONE, &regs->mode); /* 8 bit, no parity */
	131	uart_zynq_serial_setbrg(port);
	132
	133	return 0;
	134	}
	135
	136	static void uart_zynq_serial_putc(const char c, const int port)
	137	{
	138	struct uart_zynq *regs = uart_zynq_ports[port];
	139
	140	while ((readl(&regs->channel_sts) & ZYNQ_UART_SR_TXFULL) != 0)
	141	WATCHDOG_RESET();
	142
	143	if (c == '\n') {
	144	writel('\r', &regs->tx_rx_fifo);
	145	while ((readl(&regs->channel_sts) & ZYNQ_UART_SR_TXFULL) != 0)
	146	WATCHDOG_RESET();
	147	}
	148	writel(c, &regs->tx_rx_fifo);
	149	}
	150
	151	static void uart_zynq_serial_puts(const char *s, const int port)
	152	{
	153	while (*s)
	154	uart_zynq_serial_putc(*s++, port);
	155	}
	156
	157	static int uart_zynq_serial_tstc(const int port)
	158	{
	159	struct uart_zynq *regs = uart_zynq_ports[port];
	160
	161	return (readl(&regs->channel_sts) & ZYNQ_UART_SR_RXEMPTY) == 0;
	162	}
	163
	164	static int uart_zynq_serial_getc(const int port)
	165	{
	166	struct uart_zynq *regs = uart_zynq_ports[port];
	167
	168	while (!uart_zynq_serial_tstc(port))
	169	WATCHDOG_RESET();
	170	return readl(&regs->tx_rx_fifo);
	171	}
	172
	173	#if !defined(CONFIG_SERIAL_MULTI)
	174	int serial_init(void)
	175	{
	176	return uart_zynq_serial_init(0);
	177	}
	178
	179	void serial_setbrg(void)
	180	{
	181	uart_zynq_serial_setbrg(0);
	182	}
	183
	184	void serial_putc(const char c)
	185	{
	186	uart_zynq_serial_putc(c, 0);
	187	}
	188
	189	void serial_puts(const char *s)
	190	{
	191	uart_zynq_serial_puts(s, 0);
	192	}
	193
	194	int serial_getc(void)
	195	{
	196	return uart_zynq_serial_getc(0);
	197	}
	198
	199	int serial_tstc(void)
	200	{
	201	return uart_zynq_serial_tstc(0);
	202	}
	203	#else
	204	/* Multi serial device functions */
	205	#define DECLARE_PSSERIAL_FUNCTIONS(port) \
	206	int uart_zynq##port##_init(void) \
	207	{ return uart_zynq_serial_init(port); } \
	208	void uart_zynq##port##_setbrg(void) \
	209	{ return uart_zynq_serial_setbrg(port); } \
	210	int uart_zynq##port##_getc(void) \
	211	{ return uart_zynq_serial_getc(port); } \
	212	int uart_zynq##port##_tstc(void) \
	213	{ return uart_zynq_serial_tstc(port); } \
	214	void uart_zynq##port##_putc(const char c) \
	215	{ uart_zynq_serial_putc(c, port); } \
	216	void uart_zynq##port##_puts(const char *s) \
	217	{ uart_zynq_serial_puts(s, port); }
	218
	219	/* Serial device descriptor */
	220	#define INIT_PSSERIAL_STRUCTURE(port, __name) { \
	221	.name = __name, \
	222	.init = uart_zynq##port##_init, \
	223	.uninit = NULL, \
	224	.setbrg = uart_zynq##port##_setbrg, \
	225	.getc = uart_zynq##port##_getc, \
	226	.tstc = uart_zynq##port##_tstc, \
	227	.putc = uart_zynq##port##_putc, \
	228	.puts = uart_zynq##port##_puts, \
	229	}
	230
	231	DECLARE_PSSERIAL_FUNCTIONS(0);
	232	struct serial_device uart_zynq_serial0_device =
	233	INIT_PSSERIAL_STRUCTURE(0, "ttyPS0");
	234	DECLARE_PSSERIAL_FUNCTIONS(1);
	235	struct serial_device uart_zynq_serial1_device =
	236	INIT_PSSERIAL_STRUCTURE(1, "ttyPS1");
	237
	238	__weak struct serial_device *default_serial_console(void)
	239	{
	240	if (uart_zynq_ports[0])
	241	return &uart_zynq_serial0_device;
	242	if (uart_zynq_ports[1])
	243	return &uart_zynq_serial1_device;
	244
	245	return NULL;
	246	}
	247	#endif
	248

include/serial.h

Diff comments View file @ 194846f

 #ifndef __SERIAL_H__
 #define __SERIAL_H__
 #include <post.h>
 struct serial_device {
 	/* enough bytes to match alignment of following func pointer */
 	char name[16];
 	int  (*init) (void);
 	int  (*uninit) (void);
 	void (*setbrg) (void);
 	int (*getc) (void);
 	int (*tstc) (void);
 	void (*putc) (const char c);
 	void (*puts) (const char *s);
 #if CONFIG_POST & CONFIG_SYS_POST_UART
 	void (*loop) (int);
 #endif
 	struct serial_device *next;
 };
 extern struct serial_device serial_smc_device;
 extern struct serial_device serial_scc_device;
 extern struct serial_device *default_serial_console(void);
 #if	defined(CONFIG_405GP) || defined(CONFIG_405CR) || \
 	defined(CONFIG_405EP) || defined(CONFIG_405EZ) || \
 	defined(CONFIG_405EX) || defined(CONFIG_440) || \
 	defined(CONFIG_MB86R0x) || defined(CONFIG_MPC5xxx) || \
 	defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \
 	defined(CONFIG_MPC86xx) || defined(CONFIG_SYS_SC520) || \
 	defined(CONFIG_TEGRA20) || defined(CONFIG_SYS_COREBOOT) || \
 	defined(CONFIG_MICROBLAZE)
 extern struct serial_device serial0_device;
 extern struct serial_device serial1_device;
 #if defined(CONFIG_SYS_NS16550_SERIAL)
 extern struct serial_device eserial1_device;
 extern struct serial_device eserial2_device;
 extern struct serial_device eserial3_device;
 extern struct serial_device eserial4_device;
 #endif /* CONFIG_SYS_NS16550_SERIAL */
 #endif
 #if defined(CONFIG_MPC512X)
 extern struct serial_device serial1_device;
 extern struct serial_device serial3_device;
 extern struct serial_device serial4_device;
 extern struct serial_device serial6_device;
 #endif
 #if defined(CONFIG_XILINX_UARTLITE)
 extern struct serial_device uartlite_serial0_device;
 extern struct serial_device uartlite_serial1_device;
 extern struct serial_device uartlite_serial2_device;
 extern struct serial_device uartlite_serial3_device;
 #endif
 #if defined(CONFIG_S3C2410)
 extern struct serial_device s3c24xx_serial0_device;
 extern struct serial_device s3c24xx_serial1_device;
 extern struct serial_device s3c24xx_serial2_device;
 #endif
 #if defined(CONFIG_S5P)
 extern struct serial_device s5p_serial0_device;
 extern struct serial_device s5p_serial1_device;
 extern struct serial_device s5p_serial2_device;
 extern struct serial_device s5p_serial3_device;
 #endif
 #if defined(CONFIG_OMAP3_ZOOM2)
 extern struct serial_device zoom2_serial_device0;
 extern struct serial_device zoom2_serial_device1;
 extern struct serial_device zoom2_serial_device2;
 extern struct serial_device zoom2_serial_device3;
 #endif
 extern struct serial_device serial_ffuart_device;
 extern struct serial_device serial_btuart_device;
 extern struct serial_device serial_stuart_device;
 #if defined(CONFIG_SYS_BFIN_UART)
 extern void serial_register_bfin_uart(void);
 extern struct serial_device bfin_serial0_device;
 extern struct serial_device bfin_serial1_device;
 extern struct serial_device bfin_serial2_device;
 extern struct serial_device bfin_serial3_device;
 #endif
+#if defined(CONFIG_ZYNQ_SERIAL)
+extern struct serial_device uart_zynq_serial0_device;
+extern struct serial_device uart_zynq_serial1_device;
+#endif
 extern void serial_register(struct serial_device *);
 extern void serial_initialize(void);
 extern void serial_stdio_init(void);
 extern int serial_assign(const char *name);
 extern void serial_reinit_all(void);
 /* For usbtty */
 #ifdef CONFIG_USB_TTY
 extern int usbtty_getc(void);
 extern void usbtty_putc(const char c);
 extern void usbtty_puts(const char *str);
 extern int usbtty_tstc(void);
 #else
 /* stubs */
 #define usbtty_getc() 0
 #define usbtty_putc(a)
 #define usbtty_puts(a)
 #define usbtty_tstc() 0
 #endif /* CONFIG_USB_TTY */
 #if defined(CONFIG_MPC512X) &&  defined(CONFIG_SERIAL_MULTI)
 extern struct stdio_dev *open_port(int num, int baudrate);
 extern int close_port(int num);
 extern int write_port(struct stdio_dev *port, char *buf);
 extern int read_port(struct stdio_dev *port, char *buf, int size);
 #endif
 #endif