diff options
| author | Stephen Warren <swarren@nvidia.com> | 2016-05-12 12:03:35 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-05-26 20:48:31 -0600 |
| commit | 11636258981a083957c19f3979796fde5e7e8080 (patch) | |
| tree | 5410060bbc3291d6f3cc8d456a39b1462dd2626b /arch/sandbox/cpu | |
| parent | 6f82fac2f278173f5afe5b4b5dbc269646d11c0b (diff) | |
| download | u-boot-imx-11636258981a083957c19f3979796fde5e7e8080.zip u-boot-imx-11636258981a083957c19f3979796fde5e7e8080.tar.gz u-boot-imx-11636258981a083957c19f3979796fde5e7e8080.tar.bz2 | |
Rename reset to sysreset
The current reset API implements a method to reset the entire system.
In the near future, I'd like to introduce code that implements the device
tree reset bindings; i.e. the equivalent of the Linux kernel's reset API.
This controls resets to individual HW blocks or external chips with reset
signals. It doesn't make sense to merge the two APIs into one since they
have different semantic purposes. Resolve the naming conflict by renaming
the existing reset API to sysreset instead, so the new reset API can be
called just reset.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/sandbox/cpu')
| -rw-r--r-- | arch/sandbox/cpu/state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c index d2a7dc9..2b4dbd3 100644 --- a/arch/sandbox/cpu/state.c +++ b/arch/sandbox/cpu/state.c @@ -360,8 +360,8 @@ int state_init(void) assert(state->ram_buf); /* No reset yet, so mark it as such. Always allow power reset */ - state->last_reset = RESET_COUNT; - state->reset_allowed[RESET_POWER] = true; + state->last_sysreset = SYSRESET_COUNT; + state->sysreset_allowed[SYSRESET_POWER] = true; /* * Example of how to use GPIOs: |