From: Achin Gupta <achin.gupta@arm.com>
Date: Mon, 17 Dec 2012 00:15:00 +0000 (+0000)
Subject: ARM: vexpress: allow native pm ops backends to probe for psci suppport
X-Git-Tag: firefly_0821_release~3680^2~236^2^2~3^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=659eaba2ac2b87a46f5d6415230a30ae2e961bda;p=firefly-linux-kernel-4.4.55.git

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>
---

diff --git a/arch/arm/mach-vexpress/dcscb.c b/arch/arm/mach-vexpress/dcscb.c
index 16d57a8a9d5a..948aec0890f5 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
@@ -217,6 +218,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;
+	}
+
 	if (!cci_probed())
 		return -ENODEV;