Merge https://gitlab.denx.de/u-boot/custodians/u-boot-spi

[oweals/u-boot.git] / drivers / phy / meson-gxl-usb3.c

diff --git a/drivers/phy/meson-gxl-usb3.c b/drivers/phy/meson-gxl-usb3.c
index a385fbdf126cae20fabe8471a711ff112df278d2..5cbbd4d8f7ba49d03596cd112df15ebe6f921a9c 100644 (file)
--- a/drivers/phy/meson-gxl-usb3.c
+++ b/drivers/phy/meson-gxl-usb3.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Meson GXL USB3 PHY driver
  *
  * Copyright (C) 2018 Martin Blumenstingl <martin.blumenstingl@googlemail.com>
  * Copyright (C) 2018 BayLibre, SAS
  * Author: Neil Armstrong <narmstron@baylibre.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -21,8 +20,6 @@
 #include <linux/compat.h>
 #include <linux/bitfield.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 #define USB_R0                                                 0x00
        #define USB_R0_P30_FSEL_MASK                            GENMASK(5, 0)
        #define USB_R0_P30_PHY_RESET                            BIT(6)
@@ -166,7 +163,7 @@ int meson_gxl_usb3_phy_probe(struct udevice *dev)
        struct phy_meson_gxl_usb3_priv *priv = dev_get_priv(dev);
        int ret;
 
-       ret = regmap_init_mem(dev, &priv->regmap);
+       ret = regmap_init_mem(dev_ofnode(dev), &priv->regmap);
        if (ret)
                return ret;