diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-25 12:09:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-25 12:09:57 -0400 |
| commit | 397b35f09794e40d62d5e4f53992e2a711dc8be1 (patch) | |
| tree | 0696b5205c1151a600643238cb9da1f93dd15806 /drivers/power/axp305.c | |
| parent | 35a7677e382172e5024b38ff997944ca83909384 (diff) | |
| parent | c846fe43f0561311eb7261b34023a04646cdbd0d (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi
- Add and enable watchdog driver
- Prepare for SYSRESET driven AXP poweroff
- Prepare for SoCs without MMC2
- Some fixes for extending SPL (SPL-DM for RISC-V)
- Some preparations for proper VBUS management
- Fix secure monitor move
Diffstat (limited to 'drivers/power/axp305.c')
| -rw-r--r-- | drivers/power/axp305.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/axp305.c b/drivers/power/axp305.c index 0191e4d427..049ef07f74 100644 --- a/drivers/power/axp305.c +++ b/drivers/power/axp305.c @@ -69,7 +69,7 @@ int axp_init(void) return ret; } -#ifndef CONFIG_PSCI_RESET +#if !CONFIG_IS_ENABLED(ARM_PSCI_FW) && !IS_ENABLED(CONFIG_SYSRESET_CMD_POWEROFF) int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { pmic_bus_write(AXP305_SHUTDOWN, AXP305_POWEROFF); |