summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/psci.c
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2019-06-17 17:07:48 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-07-04 09:00:40 +0200
commit6d25cbb988bc431d0fe6aa12f8f6883b89d27958 (patch)
tree447a7ecd3feba6b364ddc9300f192ffa48648f27 /arch/arm/cpu/psci.c
parent2304815356102ba9766300b682c56a91fb174dbe (diff)
downloadbarebox-6d25cbb988bc431d0fe6aa12f8f6883b89d27958.tar.gz
barebox-6d25cbb988bc431d0fe6aa12f8f6883b89d27958.tar.xz
ARM: psci: fix erroneous call of ->system_reset on system_off
Both psci_system_reset and psci_system_off call psci_ops->system_reset, which seems like a copy-paste error as there is an unused ->system_off as well. Adjust psci_system_off to use ->system_off instead. This won't matter for the existing i.MX7 PSCI implementation because it defines neither callback, but it will for the upcoming STM32MP PSCI support. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/cpu/psci.c')
-rw-r--r--arch/arm/cpu/psci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/cpu/psci.c b/arch/arm/cpu/psci.c
index 5c662cd0b9..a976ddbb5c 100644
--- a/arch/arm/cpu/psci.c
+++ b/arch/arm/cpu/psci.c
@@ -138,8 +138,8 @@ static unsigned long psci_system_off(void)
{
psci_printf("%s\n", __func__);
- if (psci_ops->system_reset)
- psci_ops->system_reset();
+ if (psci_ops->system_off)
+ psci_ops->system_off();
while(1);
@@ -293,4 +293,4 @@ BAREBOX_CMD_START(smc)
BAREBOX_CMD_DESC("secure monitor test command")
BAREBOX_CMD_GROUP(CMD_GRP_MISC)
BAREBOX_CMD_END
-#endif \ No newline at end of file
+#endif