summaryrefslogtreecommitdiff
path: root/drivers/firmware
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-10-23 19:57:16 +0300
committerOlof Johansson <olof@lixom.net>2015-10-23 19:57:24 +0300
commit056a72a5597e0f3e06260d0b21feb99296f77427 (patch)
tree84a5f6db92903ad2e370217f2c3c122c66fec266 /drivers/firmware
parent825294cded91f3df99af864e4a67664cd1ccf911 (diff)
parent79b04beb1e0ac7754e667f0aa47b57a197dc343a (diff)
downloadlinux-056a72a5597e0f3e06260d0b21feb99296f77427.tar.xz
Merge branch 'drivers/psci2' into next/drivers
* drivers/psci2: drivers: psci: make PSCI 1.0 functions initialization version dependent Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/firmware')
-rw-r--r--drivers/firmware/psci.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index 492db42c4e08..d24f35d74b27 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -347,9 +347,10 @@ static int __init psci_probe(void)
psci_init_migrate();
- psci_init_cpu_suspend();
-
- psci_init_system_suspend();
+ if (PSCI_VERSION_MAJOR(ver) >= 1) {
+ psci_init_cpu_suspend();
+ psci_init_system_suspend();
+ }
return 0;
}