usb: mv_udc: Unbreak the mv_udc driver

[oweals/u-boot.git] / drivers / serial / arm_dcc.c

diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c
index dca73b93d0024ea185ac16586c6e56a1a5575dab..c217c88e59aec10c47bb547520d5eb7a1e61906c 100644 (file)
--- a/drivers/serial/arm_dcc.c
+++ b/drivers/serial/arm_dcc.c
@@ -27,7 +27,7 @@
  */
 
 #include <common.h>
-#include <devices.h>
+#include <stdio_dev.h>
 
 #if defined(CONFIG_CPU_V6)
 /*
@@ -89,15 +89,6 @@
 
 #define TIMEOUT_COUNT 0x4000000
 
-#ifndef CONFIG_ARM_DCC_MULTI
-#define arm_dcc_init serial_init
-void serial_setbrg(void) {}
-#define arm_dcc_getc serial_getc
-#define arm_dcc_putc serial_putc
-#define arm_dcc_puts serial_puts
-#define arm_dcc_tstc serial_tstc
-#endif
-
 int arm_dcc_init(void)
 {
        return 0;
@@ -147,16 +138,10 @@ int arm_dcc_tstc(void)
        return reg;
 }
 
-#ifdef CONFIG_ARM_DCC_MULTI
-static device_t arm_dcc_dev;
+static struct stdio_dev arm_dcc_dev;
 
 int drv_arm_dcc_init(void)
 {
-       int rc;
-
-       /* Device initialization */
-       memset(&arm_dcc_dev, 0, sizeof(arm_dcc_dev));
-
        strcpy(arm_dcc_dev.name, "dcc");
        arm_dcc_dev.ext = 0;    /* No extensions */
        arm_dcc_dev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_OUTPUT;
@@ -165,6 +150,10 @@ int drv_arm_dcc_init(void)
        arm_dcc_dev.putc = arm_dcc_putc;        /* 'putc' function */
        arm_dcc_dev.puts = arm_dcc_puts;        /* 'puts' function */
 
-       return device_register(&arm_dcc_dev);
+       return stdio_register(&arm_dcc_dev);
+}
+
+__weak struct serial_device *default_serial_console(void)
+{
+       return NULL;
 }
-#endif