diff options
author | Felix Fietkau <nbd@nbd.name> | 2018-07-23 10:17:35 -0400 |
---|---|---|
committer | Andy Gross <andy.gross@linaro.org> | 2018-09-13 17:11:38 -0400 |
commit | 61a3bd10082b0e861b4e1bc451a92e20181a52f5 (patch) | |
tree | 258a792b883b96cb005364bd1e2ff64cf5f79537 | |
parent | ccfb464cd106890cfa51070f75921a273e2852e5 (diff) |
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>
-rw-r--r-- | drivers/soc/qcom/spm.c | 3 |
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) | |||
219 | cpumask_t mask; | 219 | cpumask_t mask; |
220 | bool use_scm_power_down = false; | 220 | bool use_scm_power_down = false; |
221 | 221 | ||
222 | if (!qcom_scm_is_available()) | ||
223 | return -EPROBE_DEFER; | ||
224 | |||
222 | for (i = 0; ; i++) { | 225 | for (i = 0; ; i++) { |
223 | state_node = of_parse_phandle(cpu_node, "cpu-idle-states", i); | 226 | state_node = of_parse_phandle(cpu_node, "cpu-idle-states", i); |
224 | if (!state_node) | 227 | if (!state_node) |