karo: add support for TX6UL-5012

[karo-tx-uboot.git] / drivers / serial / mcfuart.c

diff --git a/drivers/serial/mcfuart.c b/drivers/serial/mcfuart.c
index 7e0b7654e8a24a24cd5b7a132cfcfbdca5b55e1a..407354fc4cdf2acac18fee8d014e4d92f63078f3 100644 (file)
--- a/drivers/serial/mcfuart.c
+++ b/drivers/serial/mcfuart.c
@@ -2,24 +2,7 @@
  * (C) Copyright 2004-2007 Freescale Semiconductor, Inc.
  * TsiChung Liew, Tsi-Chung.Liew@freescale.com.
  *
- * 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
- *
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -28,6 +11,8 @@
  */
 
 #include <common.h>
+#include <serial.h>
+#include <linux/compiler.h>
 
 #include <asm/immap.h>
 #include <asm/uart.h>
@@ -87,13 +72,6 @@ static void mcf_serial_putc(const char c)
        uart->utb = c;
 }
 
-static void mcf_serial_puts(const char *s)
-{
-       while (*s) {
-               serial_putc(*s++);
-       }
-}
-
 static int mcf_serial_getc(void)
 {
        volatile uart_t *uart = (volatile uart_t *)(CONFIG_SYS_UART_BASE);
@@ -130,14 +108,13 @@ static void mcf_serial_setbrg(void)
        uart->ucr = UART_UCR_RX_ENABLED | UART_UCR_TX_ENABLED;
 }
 
-#ifdef CONFIG_SERIAL_MULTI
 static struct serial_device mcf_serial_drv = {
        .name   = "mcf_serial",
        .start  = mcf_serial_init,
        .stop   = NULL,
        .setbrg = mcf_serial_setbrg,
        .putc   = mcf_serial_putc,
-       .puts   = mcf_serial_puts,
+       .puts   = default_serial_puts,
        .getc   = mcf_serial_getc,
        .tstc   = mcf_serial_tstc,
 };
@@ -151,34 +128,3 @@ __weak struct serial_device *default_serial_console(void)
 {
        return &mcf_serial_drv;
 }
-#else
-int serial_init(void)
-{
-       return mcf_serial_init();
-}
-
-void serial_setbrg(void)
-{
-       mcf_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
-       mcf_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
-       mcf_serial_puts(s);
-}
-
-int serial_getc(void)
-{
-       return mcf_serial_getc();
-}
-
-int serial_tstc(void)
-{
-       return mcf_serial_tstc();
-}
-#endif