aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchin Gupta <achin.gupta@arm.com>2012-12-17 00:15:00 +0000
committerJon Medhurst <tixy@linaro.org>2013-05-03 13:50:06 +0100
commit6724719f02a04223c2223914f30821e191d9a064 (patch)
treed1709aa97d5a004c76d33ffd1600ac9c10882ef7
parentd7100bcd5899eea0bf1eb45e9bccd3fd783ae252 (diff)
downloadvexpress-lsk-6724719f02a04223c2223914f30821e191d9a064.tar.gz
ARM: vexpress: allow native pm ops backends to probe for psci suppport
This patch allows the vexpress 'tc2' native backend to probe the dt for presence of the psci backend. If present then the native implementation of the 'bL_platform_power_ops' is not used. Signed-off-by: Achin Gupta <achin.gupta@arm.com> Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
-rw-r--r--arch/arm/mach-vexpress/tc2_pm.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/tc2_pm.c b/arch/arm/mach-vexpress/tc2_pm.c
index 52173568d6c..f2e9959fb26 100644
--- a/arch/arm/mach-vexpress/tc2_pm.c
+++ b/arch/arm/mach-vexpress/tc2_pm.c
@@ -23,6 +23,7 @@
#include <asm/cacheflush.h>
#include <asm/cputype.h>
#include <asm/cp15.h>
+#include <asm/psci.h>
#include <mach/motherboard.h>
#include <mach/tc2.h>
@@ -248,6 +249,12 @@ static int __init tc2_pm_init(void)
{
int ret;
+ ret = psci_probe();
+ if (!ret) {
+ pr_debug("psci found. Aborting native init\n");
+ return -ENODEV;
+ }
+
if (!vexpress_spc_check_loaded())
return -ENODEV;