X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fserial%2Farm_dcc.c;h=07981e18ee4991cfdbdcb93036ef996909b7791d;hb=40d500212f74c92ef014ae8df697416e160ee743;hp=df7eb05e82460e998be15e56734e8ff8ff83f5e3;hpb=4905dfc65d9a17083727865302d2cf633c15c911;p=u-boot

diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c
index df7eb05e82..07981e18ee 100644
--- a/drivers/serial/arm_dcc.c
+++ b/drivers/serial/arm_dcc.c
@@ -1,19 +1,9 @@
 /*
  * Copyright (C) 2004-2007 ARM Limited.
  * Copyright (C) 2008 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ * Copyright (C) 2015 - 2016 Xilinx, Inc, Michal Simek
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * 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
+ * SPDX-License-Identifier:	GPL-2.0
  *
  * As a special exception, if other files instantiate templates or use macros
  * or inline functions from this file, or you compile this file and link it
@@ -27,6 +17,7 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <serial.h>
 
 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V7)
@@ -105,12 +96,7 @@
 
 #define TIMEOUT_COUNT 0x4000000
 
-static int arm_dcc_init(void)
-{
-	return 0;
-}
-
-static int arm_dcc_getc(void)
+static int arm_dcc_getc(struct udevice *dev)
 {
 	int ch;
 	register unsigned int reg;
@@ -123,7 +109,7 @@ static int arm_dcc_getc(void)
 	return ch;
 }
 
-static void arm_dcc_putc(char ch)
+static int arm_dcc_putc(struct udevice *dev, char ch)
 {
 	register unsigned int reg;
 	unsigned int timeout_count = TIMEOUT_COUNT;
@@ -134,41 +120,57 @@ static void arm_dcc_putc(char ch)
 			break;
 	}
 	if (timeout_count == 0)
-		return;
+		return -EAGAIN;
 	else
 		write_dcc(ch);
+
+	return 0;
 }
 
-static int arm_dcc_tstc(void)
+static int arm_dcc_pending(struct udevice *dev, bool input)
 {
 	register unsigned int reg;
 
-	can_read_dcc(reg);
+	if (input) {
+		can_read_dcc(reg);
+	} else {
+		can_write_dcc(reg);
+	}
 
 	return reg;
 }
 
-static void arm_dcc_setbrg(void)
-{
-}
+static const struct dm_serial_ops arm_dcc_ops = {
+	.putc = arm_dcc_putc,
+	.pending = arm_dcc_pending,
+	.getc = arm_dcc_getc,
+};
+
+static const struct udevice_id arm_dcc_ids[] = {
+	{ .compatible = "arm,dcc", },
+	{ }
+};
 
-static struct serial_device arm_dcc_drv = {
+U_BOOT_DRIVER(serial_dcc) = {
 	.name	= "arm_dcc",
-	.start	= arm_dcc_init,
-	.stop	= NULL,
-	.setbrg	= arm_dcc_setbrg,
-	.putc	= arm_dcc_putc,
-	.puts	= default_serial_puts,
-	.getc	= arm_dcc_getc,
-	.tstc	= arm_dcc_tstc,
+	.id	= UCLASS_SERIAL,
+	.of_match = arm_dcc_ids,
+	.ops	= &arm_dcc_ops,
+	.flags = DM_FLAG_PRE_RELOC,
 };
 
-void arm_dcc_initialize(void)
+#ifdef CONFIG_DEBUG_UART_ARM_DCC
+
+#include <debug_uart.h>
+
+static inline void _debug_uart_init(void)
 {
-	serial_register(&arm_dcc_drv);
 }
 
-__weak struct serial_device *default_serial_console(void)
+static inline void _debug_uart_putc(int ch)
 {
-	return &arm_dcc_drv;
+	arm_dcc_putc(NULL, ch);
 }
+
+DEBUG_UART_FUNCS
+#endif