diff options
| author | Achin Gupta <achin.gupta@arm.com> | 2012-12-17 00:15:00 +0000 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-07-16 12:16:44 +0800 |
| commit | 5da7e9b80608c6348e745357ae51c63ff7d26313 (patch) | |
| tree | cb2e6194ae41dab2abb9a08ea9644022b202fe1b /arch/arm/mach-vexpress/dcscb.c | |
| parent | 3d9bcd1f45c07ddc1012108b08ffc7943fa45f2a (diff) | |
ARM: vexpress: allow native pm ops backends to probe for psci suppport
This patch allows the vexpress native backends 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>
(cherry picked from commit 211c84cadc1f15cd8de562e98177b42c65a4066c)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Diffstat (limited to 'arch/arm/mach-vexpress/dcscb.c')
| -rw-r--r-- | arch/arm/mach-vexpress/dcscb.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/dcscb.c b/arch/arm/mach-vexpress/dcscb.c index 14d499688736..b35700f8e01f 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 @@ -193,6 +194,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; |