summaryrefslogtreecommitdiffstats
path: root/drivers/soc
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2018-07-23 16:17:35 +0200
committerAndy Gross <andy.gross@linaro.org>2018-09-13 23:11:38 +0200
commit61a3bd10082b0e861b4e1bc451a92e20181a52f5 (patch)
tree258a792b883b96cb005364bd1e2ff64cf5f79537 /drivers/soc
parentsoc: qcom: Allow COMPILE_TEST of qcom SoC Kconfigs (diff)
downloadlinux-61a3bd10082b0e861b4e1bc451a92e20181a52f5.tar.xz
linux-61a3bd10082b0e861b4e1bc451a92e20181a52f5.zip
soc: qcom: spm: add SCM probe dependency
Check for SCM availability before attempting to use SPM. SPM probe will fail otherwise. Signed-off-by: Felix Fietkau <nbd@nbd.name> Signed-off-by: John Crispin <john@phrozen.org> Signed-off-by: Andy Gross <andy.gross@linaro.org>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/qcom/spm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/soc/qcom/spm.c b/drivers/soc/qcom/spm.c
index f9d7a85b2822..53807e839664 100644
--- a/drivers/soc/qcom/spm.c
+++ b/drivers/soc/qcom/spm.c
@@ -219,6 +219,9 @@ static int __init qcom_cpuidle_init(struct device_node *cpu_node, int cpu)
cpumask_t mask;
bool use_scm_power_down = false;
+ if (!qcom_scm_is_available())
+ return -EPROBE_DEFER;
+
for (i = 0; ; i++) {
state_node = of_parse_phandle(cpu_node, "cpu-idle-states", i);
if (!state_node)