diff options
| -rw-r--r-- | drivers/misc/reset-uclass.c | 31 | ||||
| -rw-r--r-- | include/reset.h | 11 |
2 files changed, 35 insertions, 7 deletions
diff --git a/drivers/misc/reset-uclass.c b/drivers/misc/reset-uclass.c index ba277570c5..fdb5c6fcff 100644 --- a/drivers/misc/reset-uclass.c +++ b/drivers/misc/reset-uclass.c @@ -25,23 +25,34 @@ int reset_request(struct udevice *dev, enum reset_t type) return ops->request(dev, type); } -void reset_walk(enum reset_t type) +int reset_walk(enum reset_t type) { struct udevice *dev; - int ret = 0; + int ret = -ENOSYS; while (ret != -EINPROGRESS && type < RESET_COUNT) { for (uclass_first_device(UCLASS_RESET, &dev); - dev; - uclass_next_device(&dev)) { + dev; + uclass_next_device(&dev)) { ret = reset_request(dev, type); if (ret == -EINPROGRESS) break; } + type++; } + return ret; +} + +void reset_walk_halt(enum reset_t type) +{ + int ret; + + ret = reset_walk(type); + /* Wait for the reset to take effect */ - mdelay(100); + if (ret == -EINPROGRESS) + mdelay(100); /* Still no reset? Give up */ printf("Reset not supported on this platform\n"); @@ -53,7 +64,15 @@ void reset_walk(enum reset_t type) */ void reset_cpu(ulong addr) { - reset_walk(RESET_WARM); + reset_walk_halt(RESET_WARM); +} + + +int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + reset_walk_halt(RESET_WARM); + + return 0; } UCLASS_DRIVER(reset) = { diff --git a/include/reset.h b/include/reset.h index d29e108eec..383761eb1f 100644 --- a/include/reset.h +++ b/include/reset.h @@ -51,8 +51,17 @@ int reset_request(struct udevice *dev, enum reset_t type); * If this function fails to reset, it will display a message and halt * * @type: Reset type to request + * @return -EINPROGRESS if a reset is in progress, -ENOSYS if not available */ -void reset_walk(enum reset_t type); +int reset_walk(enum reset_t type); + +/** + * reset_walk_halt() - try to reset, otherwise halt + * + * This calls reset_walk(). If it returns, indicating that reset is not + * supported, it prints a message and halts. + */ +void reset_walk_halt(enum reset_t type); /** * reset_cpu() - calls reset_walk(RESET_WARM) |