Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"

[J-u-boot.git] / drivers / reset / reset-sifive.c

diff --git a/drivers/reset/reset-sifive.c b/drivers/reset/reset-sifive.c
index 527757f8533da841620e5a4d0725db26db39e19b..65f857149b963918850577603787a928797164ea 100644 (file)
--- a/drivers/reset/reset-sifive.c
+++ b/drivers/reset/reset-sifive.c
@@ -4,11 +4,11 @@
  * Author: Sagar Kadam <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <reset-uclass.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
+#include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <linux/bitops.h>
 
@@ -62,16 +62,6 @@ static int sifive_reset_request(struct reset_ctl *rst)
        return 0;
 }
 
-static int sifive_reset_free(struct reset_ctl *rst)
-{
-       struct sifive_reset_priv *priv = dev_get_priv(rst->dev);
-
-       debug("%s(rst=%p) (dev=%p, id=%lu) (nr_reset=%d)\n", __func__,
-             rst, rst->dev, rst->id, priv->nr_reset);
-
-       return 0;
-}
-
 static int sifive_reset_probe(struct udevice *dev)
 {
        struct sifive_reset_priv *priv = dev_get_priv(dev);
@@ -97,14 +87,13 @@ int sifive_reset_bind(struct udevice *dev, ulong count)
        }
        priv = malloc(sizeof(struct sifive_reset_priv));
        priv->nr_reset = count;
-       rst_dev->priv = priv;
+       dev_set_priv(rst_dev, priv);
 
        return 0;
 }
 
 const struct reset_ops sifive_reset_ops = {
        .request = sifive_reset_request,
-       .rfree = sifive_reset_free,
        .rst_assert = sifive_reset_assert,
        .rst_deassert = sifive_reset_deassert,
 };
@@ -114,5 +103,5 @@ U_BOOT_DRIVER(sifive_reset) = {
        .id             = UCLASS_RESET,
        .ops            = &sifive_reset_ops,
        .probe          = sifive_reset_probe,
-       .priv_auto_alloc_size = sizeof(struct sifive_reset_priv),
+       .priv_auto      = sizeof(struct sifive_reset_priv),
 };