Merge tag 'u-boot-rockchip-20200531' of https://gitlab.denx.de/u-boot/custodians...

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

diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c
index a2e93039257133aa97ef101d5f2208ebb100f187..f29a9a0b569c549732b3fb7ece637b65f5e92c49 100644 (file)
--- a/drivers/serial/serial_xuartlite.c
+++ b/drivers/serial/serial_xuartlite.c
@@ -1,22 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2008 - 2015 Michal Simek <monstr@monstr.eu>
  * Clean driver and add xilinx constant from header file
  *
  * (C) Copyright 2004 Atmark Techno, Inc.
  * Yasushi SHOJI <yashi@atmark-techno.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <config.h>
 #include <common.h>
 #include <dm.h>
 #include <asm/io.h>
+#include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <serial.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 #define SR_TX_FIFO_FULL                BIT(3) /* transmit FIFO full */
 #define SR_TX_FIFO_EMPTY       BIT(2) /* transmit FIFO empty */
 #define SR_RX_FIFO_VALID_DATA  BIT(0) /* data in receive FIFO */
@@ -87,7 +85,7 @@ static int uartlite_serial_ofdata_to_platdata(struct udevice *dev)
 {
        struct uartlite_platdata *plat = dev_get_platdata(dev);
 
-       plat->regs = (struct uartlite *)dev_get_addr(dev);
+       plat->regs = (struct uartlite *)devfdt_get_addr(dev);
 
        return 0;
 }
@@ -112,7 +110,6 @@ U_BOOT_DRIVER(serial_uartlite) = {
        .platdata_auto_alloc_size = sizeof(struct uartlite_platdata),
        .probe = uartlite_serial_probe,
        .ops    = &uartlite_serial_ops,
-       .flags = DM_FLAG_PRE_RELOC,
 };
 
 #ifdef CONFIG_DEBUG_UART_UARTLITE