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

[u-boot] / drivers / usb / host / xhci-fsl.c

diff --git a/drivers/usb/host/xhci-fsl.c b/drivers/usb/host/xhci-fsl.c
index 3a16624713b4f16fda67df7fa7f10dc6bb2923f0..047a8dfdef9531ef7841ab84e46f77421074adb5 100644 (file)
--- a/drivers/usb/host/xhci-fsl.c
+++ b/drivers/usb/host/xhci-fsl.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2015,2016 Freescale Semiconductor, Inc.
  *
  * FSL USB HOST xHCI Controller
  *
  * Author: Ramneek Mehresh<ramneek.mehresh@freescale.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -20,8 +19,6 @@
 #include <dm.h>
 
 /* Declare global data pointer */
-DECLARE_GLOBAL_DATA_PTR;
-
 #ifndef CONFIG_DM_USB
 static struct fsl_xhci fsl_xhci;
 unsigned long ctr_addr[] = FSL_USB_XHCI_ADDR;
@@ -122,7 +119,7 @@ static int xhci_fsl_probe(struct udevice *dev)
        /*
         * Get the base address for XHCI controller from the device node
         */
-       priv->hcd_base = dev_get_addr(dev);
+       priv->hcd_base = devfdt_get_addr(dev);
        if (priv->hcd_base == FDT_ADDR_T_NONE) {
                debug("Can't get the XHCI register base address\n");
                return -ENXIO;