Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / drivers / reset / reset-uclass.c

diff --git a/drivers/reset/reset-uclass.c b/drivers/reset/reset-uclass.c
index de3695ffaafc8a581a79c156e6284efd8b694d8f..38995376350b757aae7efb9114d2eac5763bb4e0 100644 (file)
--- a/drivers/reset/reset-uclass.c
+++ b/drivers/reset/reset-uclass.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2016, NVIDIA CORPORATION.
- *
- * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <common.h>
@@ -10,8 +9,6 @@
 #include <reset.h>
 #include <reset-uclass.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 static inline struct reset_ops *reset_dev_ops(struct udevice *dev)
 {
        return (struct reset_ops *)dev->driver->ops;
@@ -42,6 +39,7 @@ int reset_get_by_index(struct udevice *dev, int index,
 
        debug("%s(dev=%p, index=%d, reset_ctl=%p)\n", __func__, dev, index,
              reset_ctl);
+       reset_ctl->dev = NULL;
 
        ret = dev_read_phandle_with_args(dev, "resets", "#reset-cells", 0,
                                          index, &args);
@@ -80,6 +78,40 @@ int reset_get_by_index(struct udevice *dev, int index,
        return 0;
 }
 
+int reset_get_bulk(struct udevice *dev, struct reset_ctl_bulk *bulk)
+{
+       int i, ret, err, count;
+       
+       bulk->count = 0;
+
+       count = dev_count_phandle_with_args(dev, "resets", "#reset-cells");
+       if (count < 1)
+               return count;
+
+       bulk->resets = devm_kcalloc(dev, count, sizeof(struct reset_ctl),
+                                   GFP_KERNEL);
+       if (!bulk->resets)
+               return -ENOMEM;
+
+       for (i = 0; i < count; i++) {
+               ret = reset_get_by_index(dev, i, &bulk->resets[i]);
+               if (ret < 0)
+                       goto bulk_get_err;
+
+               ++bulk->count;
+       }
+
+       return 0;
+
+bulk_get_err:
+       err = reset_release_all(bulk->resets, bulk->count);
+       if (err)
+               debug("%s: could release all resets for %p\n",
+                     __func__, dev);
+
+       return ret;
+}
+
 int reset_get_by_name(struct udevice *dev, const char *name,
                     struct reset_ctl *reset_ctl)
 {
@@ -87,6 +119,7 @@ int reset_get_by_name(struct udevice *dev, const char *name,
 
        debug("%s(dev=%p, name=%s, reset_ctl=%p)\n", __func__, dev, name,
              reset_ctl);
+       reset_ctl->dev = NULL;
 
        index = dev_read_stringlist_search(dev, "reset-names", name);
        if (index < 0) {
@@ -97,6 +130,15 @@ int reset_get_by_name(struct udevice *dev, const char *name,
        return reset_get_by_index(dev, index, reset_ctl);
 }
 
+int reset_request(struct reset_ctl *reset_ctl)
+{
+       struct reset_ops *ops = reset_dev_ops(reset_ctl->dev);
+
+       debug("%s(reset_ctl=%p)\n", __func__, reset_ctl);
+
+       return ops->request(reset_ctl);
+}
+
 int reset_free(struct reset_ctl *reset_ctl)
 {
        struct reset_ops *ops = reset_dev_ops(reset_ctl->dev);
@@ -115,6 +157,19 @@ int reset_assert(struct reset_ctl *reset_ctl)
        return ops->rst_assert(reset_ctl);
 }
 
+int reset_assert_bulk(struct reset_ctl_bulk *bulk)
+{
+       int i, ret;
+
+       for (i = 0; i < bulk->count; i++) {
+               ret = reset_assert(&bulk->resets[i]);
+               if (ret < 0)
+                       return ret;
+       }
+
+       return 0;
+}
+
 int reset_deassert(struct reset_ctl *reset_ctl)
 {
        struct reset_ops *ops = reset_dev_ops(reset_ctl->dev);
@@ -124,6 +179,42 @@ int reset_deassert(struct reset_ctl *reset_ctl)
        return ops->rst_deassert(reset_ctl);
 }
 
+int reset_deassert_bulk(struct reset_ctl_bulk *bulk)
+{
+       int i, ret;
+
+       for (i = 0; i < bulk->count; i++) {
+               ret = reset_deassert(&bulk->resets[i]);
+               if (ret < 0)
+                       return ret;
+       }
+
+       return 0;
+}
+
+int reset_release_all(struct reset_ctl *reset_ctl, int count)
+{
+       int i, ret;
+
+       for (i = 0; i < count; i++) {
+               debug("%s(reset_ctl[%d]=%p)\n", __func__, i, &reset_ctl[i]);
+
+               /* check if reset has been previously requested */
+               if (!reset_ctl[i].dev)
+                       continue;
+
+               ret = reset_assert(&reset_ctl[i]);
+               if (ret)
+                       return ret;
+
+               ret = reset_free(&reset_ctl[i]);
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
+}
+
 UCLASS_DRIVER(reset) = {
        .id             = UCLASS_RESET,
        .name           = "reset",