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

[oweals/u-boot.git] / drivers / phy / bcm6368-usbh-phy.c

diff --git a/drivers/phy/bcm6368-usbh-phy.c b/drivers/phy/bcm6368-usbh-phy.c
index 71abc0fcc4b157b0e5f723afcdf0d3f6ff05e32e..99fdd33499adf92f060bab4bf272664909b4794d 100644 (file)
--- a/drivers/phy/bcm6368-usbh-phy.c
+++ b/drivers/phy/bcm6368-usbh-phy.c
@@ -1,21 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2018 Ã\83Â\81lvaro FernÃ\83¡ndez Rojas <noltari@gmail.com>
+ * Copyright (C) 2018 Ã\81lvaro Fernández Rojas <noltari@gmail.com>
  *
  * Derived from linux/arch/mips/bcm63xx/usb-common.c:
  *     Copyright 2008 Maxime Bizon <mbizon@freebox.fr>
  *     Copyright 2013 Florian Fainelli <florian@openwrt.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <generic-phy.h>
+#include <log.h>
+#include <malloc.h>
 #include <power-domain.h>
 #include <reset.h>
 #include <asm/io.h>
 #include <dm/device.h>
+#include <linux/bitops.h>
+#include <linux/delay.h>
 
 /* USBH PLL Control register */
 #define USBH_PLL_REG           0x18
@@ -117,15 +120,12 @@ static int bcm6368_usbh_probe(struct udevice *dev)
 #endif
        struct reset_ctl rst_ctl;
        struct clk clk;
-       fdt_addr_t addr;
-       fdt_size_t size;
        int ret;
 
-       addr = devfdt_get_addr_size_index(dev, 0, &size);
-       if (addr == FDT_ADDR_T_NONE)
+       priv->regs = dev_remap_addr(dev);
+       if (!priv->regs)
                return -EINVAL;
 
-       priv->regs = ioremap(addr, size);
        priv->hw = hw;
 
        /* enable usbh clock */