Merge branch 'master' of git://git.denx.de/u-boot-socfpga

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

diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c
index a2e93039257133aa97ef101d5f2208ebb100f187..cead3c62f5a144bce78913037441faf4cc4ad839 100644 (file)
--- a/drivers/serial/serial_xuartlite.c
+++ b/drivers/serial/serial_xuartlite.c
@@ -1,11 +1,10 @@
+// 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>
@@ -15,8 +14,6 @@
 #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 +84,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;
 }