colibri_imx6: fix video stdout in default environment

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

diff --git a/drivers/phy/bcm6318-usbh-phy.c b/drivers/phy/bcm6318-usbh-phy.c
index 6d54214581816270bdd2630a0f71a843aa2df96c..d29344ddb484ec55f472df7c73118c0cb7d0d23a 100644 (file)
--- a/drivers/phy/bcm6318-usbh-phy.c
+++ b/drivers/phy/bcm6318-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 Setup register */
 #define USBH_SETUP_REG         0x00
@@ -80,16 +83,12 @@ static int bcm6318_usbh_probe(struct udevice *dev)
        struct power_domain pwr_dom;
        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);
-
        /* enable usbh clock */
        ret = clk_get_by_name(dev, "usbh", &clk);
        if (ret < 0)