]> Git Repo - J-u-boot.git/blobdiff - drivers/serial/atmel_usart.c
Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""
[J-u-boot.git] / drivers / serial / atmel_usart.c
index bd14f3e78192edcb48d4a7dc5b3b12f724f6cfb6..9827c006fa88b3df1944445917a5d5dc056e0ecc 100644 (file)
@@ -18,7 +18,7 @@
 #include <linux/delay.h>
 
 #include <asm/io.h>
-#ifdef CONFIG_DM_SERIAL
+#if CONFIG_IS_ENABLED(DM_SERIAL)
 #include <asm/arch/atmel_serial.h>
 #endif
 #include <asm/arch/clk.h>
@@ -28,7 +28,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifndef CONFIG_DM_SERIAL
+#if !CONFIG_IS_ENABLED(DM_SERIAL)
 static void atmel_serial_setbrg_internal(atmel_usart3_t *usart, int id,
                                         int baudrate)
 {
@@ -72,13 +72,13 @@ static void atmel_serial_activate(atmel_usart3_t *usart)
 
 static void atmel_serial_setbrg(void)
 {
-       atmel_serial_setbrg_internal((atmel_usart3_t *)CONFIG_USART_BASE,
-                                    CONFIG_USART_ID, gd->baudrate);
+       atmel_serial_setbrg_internal((atmel_usart3_t *)CFG_USART_BASE,
+                                    CFG_USART_ID, gd->baudrate);
 }
 
 static int atmel_serial_init(void)
 {
-       atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;
+       atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE;
 
        atmel_serial_init_internal(usart);
        serial_setbrg();
@@ -89,7 +89,7 @@ static int atmel_serial_init(void)
 
 static void atmel_serial_putc(char c)
 {
-       atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;
+       atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE;
 
        if (c == '\n')
                serial_putc('\r');
@@ -100,16 +100,16 @@ static void atmel_serial_putc(char c)
 
 static int atmel_serial_getc(void)
 {
-       atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;
+       atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE;
 
        while (!(readl(&usart->csr) & USART3_BIT(RXRDY)))
-                WATCHDOG_RESET();
+                schedule();
        return readl(&usart->rhr);
 }
 
 static int atmel_serial_tstc(void)
 {
-       atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;
+       atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE;
        return (readl(&usart->csr) & USART3_BIT(RXRDY)) != 0;
 }
 
@@ -133,9 +133,7 @@ __weak struct serial_device *default_serial_console(void)
 {
        return &atmel_serial_drv;
 }
-#endif
-
-#ifdef CONFIG_DM_SERIAL
+#else
 enum serial_clk_type {
        CLK_TYPE_NORMAL = 0,
        CLK_TYPE_DBGU,
@@ -255,8 +253,6 @@ static int atmel_serial_enable_clk(struct udevice *dev)
 
        priv->usart_clk_rate = clk_rate;
 
-       clk_free(&clk);
-
        return 0;
 }
 #endif
@@ -319,14 +315,14 @@ U_BOOT_DRIVER(serial_atmel) = {
 #ifdef CONFIG_DEBUG_UART_ATMEL
 static inline void _debug_uart_init(void)
 {
-       atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_DEBUG_UART_BASE;
+       atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_VAL(DEBUG_UART_BASE);
 
        _atmel_serial_init(usart, CONFIG_DEBUG_UART_CLOCK, CONFIG_BAUDRATE);
 }
 
 static inline void _debug_uart_putc(int ch)
 {
-       atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_DEBUG_UART_BASE;
+       atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_VAL(DEBUG_UART_BASE);
 
        while (!(readl(&usart->csr) & USART3_BIT(TXRDY)))
                ;
This page took 0.027372 seconds and 4 git commands to generate.