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~1^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=58068c45b899873906a6dccc94715a3e72387d42;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 '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>
---

diff --git a/arch/arm/mach-vexpress/tc2_pm.c b/arch/arm/mach-vexpress/tc2_pm.c
index fddea7c3a2a0..9c742edb7ae6 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;