Merge tag 'v2021.01-rc5' into next

[platform/kernel/u-boot.git] / drivers / phy / sti_usb_phy.c

diff --git a/drivers/phy/sti_usb_phy.c b/drivers/phy/sti_usb_phy.c
index 0e0b1c0..87c1bcd 100644 (file)
--- a/drivers/phy/sti_usb_phy.c
+++ b/drivers/phy/sti_usb_phy.c
@@ -1,18 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (c) 2017
- * Patrice Chotard <patrice.chotard@st.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
+ * Author(s): Patrice Chotard, <patrice.chotard@foss.st.com> for STMicroelectronics.
  */
 
 #include <common.h>
+#include <log.h>
 #include <asm/io.h>
 #include <bitfield.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
 #include <generic-phy.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
 #include <regmap.h>
 #include <reset-uclass.h>
 #include <syscon.h>
@@ -47,13 +47,13 @@ static int sti_usb_phy_deassert(struct sti_usb_phy *phy)
 
        ret = reset_deassert(&phy->global_ctl);
        if (ret < 0) {
-               error("PHY global deassert failed: %d", ret);
+               pr_err("PHY global deassert failed: %d", ret);
                return ret;
        }
 
        ret = reset_deassert(&phy->port_ctl);
        if (ret < 0)
-               error("PHY port deassert failed: %d", ret);
+               pr_err("PHY port deassert failed: %d", ret);
 
        return ret;
 }
@@ -65,12 +65,12 @@ static int sti_usb_phy_init(struct phy *usb_phy)
        void __iomem *reg;
 
        /* set ctrl picophy value */
-       reg = (void __iomem *)phy->regmap->base + phy->ctrl;
+       reg = (void __iomem *)phy->regmap->ranges[0].start + phy->ctrl;
        /* CTRL_PORT mask is 0x1f */
        clrsetbits_le32(reg, 0x1f, STIH407_USB_PICOPHY_CTRL_PORT_CONF);
 
        /* set ports parameters overriding */
-       reg = (void __iomem *)phy->regmap->base + phy->param;
+       reg = (void __iomem *)phy->regmap->ranges[0].start + phy->param;
        /* PARAM_DEF mask is 0xffffffff */
        clrsetbits_le32(reg, 0xffffffff, STIH407_USB_PICOPHY_PARAM_DEF);
 
@@ -85,13 +85,13 @@ static int sti_usb_phy_exit(struct phy *usb_phy)
 
        ret = reset_assert(&phy->port_ctl);
        if (ret < 0) {
-               error("PHY port assert failed: %d", ret);
+               pr_err("PHY port assert failed: %d", ret);
                return ret;
        }
 
        ret = reset_assert(&phy->global_ctl);
        if (ret < 0)
-               error("PHY global assert failed: %d", ret);
+               pr_err("PHY global assert failed: %d", ret);
 
        return ret;
 }
@@ -114,20 +114,20 @@ int sti_usb_phy_probe(struct udevice *dev)
                                         &syscfg_phandle);
 
        if (ret < 0) {
-               error("Can't get syscfg phandle: %d\n", ret);
+               pr_err("Can't get syscfg phandle: %d\n", ret);
                return ret;
        }
 
        ret = uclass_get_device_by_ofnode(UCLASS_SYSCON, syscfg_phandle.node,
                                          &syscon);
        if (ret) {
-               error("unable to find syscon device (%d)\n", ret);
+               pr_err("unable to find syscon device (%d)\n", ret);
                return ret;
        }
 
        priv->regmap = syscon_get_regmap(syscon);
        if (!priv->regmap) {
-               error("unable to find regmap\n");
+               pr_err("unable to find regmap\n");
                return -ENODEV;
        }
 
@@ -137,12 +137,12 @@ int sti_usb_phy_probe(struct udevice *dev)
                                           ARRAY_SIZE(cells));
 
        if (count < 0) {
-               error("Bad PHY st,syscfg property %d\n", count);
+               pr_err("Bad PHY st,syscfg property %d\n", count);
                return -EINVAL;
        }
 
        if (count > PHYPARAM_NB) {
-               error("Unsupported PHY param count %d\n", count);
+               pr_err("Unsupported PHY param count %d\n", count);
                return -EINVAL;
        }
 
@@ -152,14 +152,14 @@ int sti_usb_phy_probe(struct udevice *dev)
        /* get global reset control */
        ret = reset_get_by_name(dev, "global", &priv->global_ctl);
        if (ret) {
-               error("can't get global reset for %s (%d)", dev->name, ret);
+               pr_err("can't get global reset for %s (%d)", dev->name, ret);
                return ret;
        }
 
        /* get port reset control */
        ret = reset_get_by_name(dev, "port", &priv->port_ctl);
        if (ret) {
-               error("can't get port reset for %s (%d)", dev->name, ret);
+               pr_err("can't get port reset for %s (%d)", dev->name, ret);
                return ret;
        }
 
@@ -177,5 +177,5 @@ U_BOOT_DRIVER(sti_usb_phy) = {
        .of_match = sti_usb_phy_ids,
        .probe = sti_usb_phy_probe,
        .ops = &sti_usb_phy_ops,
-       .priv_auto_alloc_size = sizeof(struct sti_usb_phy),
+       .priv_auto      = sizeof(struct sti_usb_phy),
 };