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 12:11:42 +0100
commit0839ed53649d1153e7ba8fd8c3bccb48938e9ffd (patch)
tree6e6162cd446408045fd83a4d915bcb83360d8fdf
parentf40ffc6070d9583ed69126b876740cbd823c24af (diff)
downloadvexpress-lsk-0839ed53649d1153e7ba8fd8c3bccb48938e9ffd.tar.gz
ARM: vexpress: allow native pm ops backends to probe for psci suppport
This patch allows the vexpress 'rtsm' 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> Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--arch/arm/mach-vexpress/dcscb.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/dcscb.c b/arch/arm/mach-vexpress/dcscb.c
index 68c8fdddffc..0dc3caca227 100644
--- a/arch/arm/mach-vexpress/dcscb.c
+++ b/arch/arm/mach-vexpress/dcscb.c
@@ -23,6 +23,7 @@
#include <asm/cacheflush.h>
#include <asm/cputype.h>
#include <asm/cp15.h>
+#include <asm/psci.h>
#define RST_HOLD0 0x0
@@ -218,6 +219,12 @@ static int __init dcscb_init(void)
unsigned int cfg;
int ret;
+ ret = psci_probe();
+ if (!ret) {
+ pr_debug("psci found. Aborting native init\n");
+ return -ENODEV;
+ }
+
node = of_find_compatible_node(NULL, NULL, "arm,rtsm,dcscb");
if (!node)
return -ENODEV;