Rename reset to sysreset

[platform/kernel/u-boot.git] / drivers / misc / sysreset-uclass.c

diff --git a/drivers/misc/reset-uclass.c b/drivers/misc/sysreset-uclass.c
similarity index 55%
rename from drivers/misc/reset-uclass.c
rename to drivers/misc/sysreset-uclass.c
index fdb5c6f..e41efca 100644 (file)
--- a/drivers/misc/reset-uclass.c
+++ b/drivers/misc/sysreset-uclass.c
@@ -6,7 +6,7 @@
  */
 
 #include <common.h>
-#include <reset.h>
+#include <sysreset.h>
 #include <dm.h>
 #include <errno.h>
 #include <regmap.h>
@@ -15,9 +15,9 @@
 #include <dm/root.h>
 #include <linux/err.h>
 
-int reset_request(struct udevice *dev, enum reset_t type)
+int sysreset_request(struct udevice *dev, enum sysreset_t type)
 {
-       struct reset_ops *ops = reset_get_ops(dev);
+       struct sysreset_ops *ops = sysreset_get_ops(dev);
 
        if (!ops->request)
                return -ENOSYS;
@@ -25,16 +25,16 @@ int reset_request(struct udevice *dev, enum reset_t type)
        return ops->request(dev, type);
 }
 
-int reset_walk(enum reset_t type)
+int sysreset_walk(enum sysreset_t type)
 {
        struct udevice *dev;
        int ret = -ENOSYS;
 
-       while (ret != -EINPROGRESS && type < RESET_COUNT) {
-               for (uclass_first_device(UCLASS_RESET, &dev);
+       while (ret != -EINPROGRESS && type < SYSRESET_COUNT) {
+               for (uclass_first_device(UCLASS_SYSRESET, &dev);
                     dev;
                     uclass_next_device(&dev)) {
-                       ret = reset_request(dev, type);
+                       ret = sysreset_request(dev, type);
                        if (ret == -EINPROGRESS)
                                break;
                }
@@ -44,38 +44,38 @@ int reset_walk(enum reset_t type)
        return ret;
 }
 
-void reset_walk_halt(enum reset_t type)
+void sysreset_walk_halt(enum sysreset_t type)
 {
        int ret;
 
-       ret = reset_walk(type);
+       ret = sysreset_walk(type);
 
        /* Wait for the reset to take effect */
        if (ret == -EINPROGRESS)
                mdelay(100);
 
        /* Still no reset? Give up */
-       printf("Reset not supported on this platform\n");
+       printf("System reset not supported on this platform\n");
        hang();
 }
 
 /**
- * reset_cpu() - calls reset_walk(RESET_WARM)
+ * reset_cpu() - calls sysreset_walk(SYSRESET_WARM)
  */
 void reset_cpu(ulong addr)
 {
-       reset_walk_halt(RESET_WARM);
+       sysreset_walk_halt(SYSRESET_WARM);
 }
 
 
 int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       reset_walk_halt(RESET_WARM);
+       sysreset_walk_halt(SYSRESET_WARM);
 
        return 0;
 }
 
-UCLASS_DRIVER(reset) = {
-       .id             = UCLASS_RESET,
-       .name           = "reset",
+UCLASS_DRIVER(sysreset) = {
+       .id             = UCLASS_SYSRESET,
+       .name           = "sysreset",
 };