diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-19 09:22:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-19 09:22:57 -0400 |
| commit | a2ca54ff52146f2bbf52d87bf4e121e8e15e9e07 (patch) | |
| tree | 4e85487bc3da5aa7a918ca7bb2f8fffb2c8c0d20 /drivers/sysreset/sysreset_sandbox.c | |
| parent | 0ed2e2d825ac70d99ef89e3bb745979a22e2972e (diff) | |
| parent | b8050511c6ee4ab60ef4248dff42aff187696249 (diff) | |
Merge tag 'u-boot-rockchip-20190819' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- Add ROC-RK3399-PC board support
- Move CONFIG_SPI_FLASH_GIGADEVICE and CONFIG_CMD_USB_MASS_STORAGE to
Kconfig
- using SYSRESET_POWER_OFF for poweroff
(Note that patch for rk8xx pmic is droped for it can not pass Travis
build)
- fix ofnode_get_name() assert
Diffstat (limited to 'drivers/sysreset/sysreset_sandbox.c')
| -rw-r--r-- | drivers/sysreset/sysreset_sandbox.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sysreset/sysreset_sandbox.c b/drivers/sysreset/sysreset_sandbox.c index 7dfd89460f0..69c22a70008 100644 --- a/drivers/sysreset/sysreset_sandbox.c +++ b/drivers/sysreset/sysreset_sandbox.c @@ -57,13 +57,13 @@ static int sandbox_sysreset_request(struct udevice *dev, enum sysreset_t type) case SYSRESET_COLD: state->last_sysreset = type; break; - case SYSRESET_POWER: + case SYSRESET_POWER_OFF: state->last_sysreset = type; if (!state->sysreset_allowed[type]) return -EACCES; sandbox_exit(); break; - case SYSRESET_POWER_OFF: + case SYSRESET_POWER: if (!state->sysreset_allowed[type]) return -EACCES; sandbox_exit(); |