power: axp: Avoid do_poweroff conflict with sysreset
authorSamuel Holland <samuel@sholland.org>
Sun, 22 Aug 2021 23:18:05 +0000 (18:18 -0500)
committerAndre Przywara <andre.przywara@arm.com>
Mon, 25 Oct 2021 13:50:54 +0000 (14:50 +0100)
commit830e161eb4e9dbd3e9eb20ad6a3255eb8b4ed3c4
tree384bd10d5a308a33b806f0a4e2058e61d6590d00
parent344df3ca2c3c2e98c9ab4112e8ebd660ad2be6ea
power: axp: Avoid do_poweroff conflict with sysreset

The sysreset uclass has an option to provide the do_poweroff() function.
When that option is enabled, the AXP power drivers should not provide
their own definition.

For the AXP305, which is paired with 64-bit systems where TF-A provides
PSCI, there is another possible conflict with the PSCI firmware driver.
This driver can be enabled even if CONFIG_PSCI_RESET is disabled, so
make sure to use the right symbol in the condition.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
drivers/power/axp152.c
drivers/power/axp209.c
drivers/power/axp221.c
drivers/power/axp305.c
drivers/power/axp809.c
drivers/power/axp818.c