arm926ejs, at91: add common phy_reset function

[u-boot] / drivers / serial / serial_pl01x.c

diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index beb0c98b23f257843efaa09c9c90b88d6d274f84..dfb610e1a9d553429d1462335a6550f6d31afe04 100644 (file)
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -6,23 +6,7 @@
  * ARM Ltd.
  * Philippe Robin, <philippe.robin@arm.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+
  */
 
 /* Simple U-Boot driver for the PrimeCell PL010/PL011 UARTs */
@@ -163,8 +147,8 @@ static int pl01x_serial_init(void)
        }
 #endif
        /* Finally, enable the UART */
-       writel(UART_PL011_CR_UARTEN | UART_PL011_CR_TXE | UART_PL011_CR_RXE,
-              &regs->pl011_cr);
+       writel(UART_PL011_CR_UARTEN | UART_PL011_CR_TXE | UART_PL011_CR_RXE |
+              UART_PL011_CR_RTS, &regs->pl011_cr);
 
        return 0;
 }
@@ -179,13 +163,6 @@ static void pl01x_serial_putc(const char c)
        pl01x_putc (CONSOLE_PORT, c);
 }
 
-static void pl01x_serial_puts(const char *s)
-{
-       while (*s) {
-               serial_putc (*s++);
-       }
-}
-
 static int pl01x_serial_getc(void)
 {
        return pl01x_getc (CONSOLE_PORT);
@@ -253,14 +230,13 @@ static int pl01x_tstc (int portnum)
        return !(readl(&regs->fr) & UART_PL01x_FR_RXFE);
 }
 
-#ifdef CONFIG_SERIAL_MULTI
 static struct serial_device pl01x_serial_drv = {
        .name   = "pl01x_serial",
        .start  = pl01x_serial_init,
        .stop   = NULL,
        .setbrg = pl01x_serial_setbrg,
        .putc   = pl01x_serial_putc,
-       .puts   = pl01x_serial_puts,
+       .puts   = default_serial_puts,
        .getc   = pl01x_serial_getc,
        .tstc   = pl01x_serial_tstc,
 };
@@ -274,34 +250,3 @@ __weak struct serial_device *default_serial_console(void)
 {
        return &pl01x_serial_drv;
 }
-#else
-int serial_init(void)
-{
-       return pl01x_serial_init();
-}
-
-void serial_setbrg(void)
-{
-       pl01x_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
-       pl01x_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
-       pl01x_serial_puts(s);
-}
-
-int serial_getc(void)
-{
-       return pl01x_serial_getc();
-}
-
-int serial_tstc(void)
-{
-       return pl01x_serial_tstc();
-}
-#endif