soc: qcom: spm: add SCM probe dependency
authorFelix Fietkau <nbd@nbd.name>
Mon, 23 Jul 2018 14:17:35 +0000 (16:17 +0200)
committerAndy Gross <andy.gross@linaro.org>
Thu, 13 Sep 2018 21:11:38 +0000 (16:11 -0500)
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>
drivers/soc/qcom/spm.c

index f9d7a85b2822036dd1cdd7497032c98f2f7ea383..53807e839664e9f3ca70e92d9e5a5e336e38b4c0 100644 (file)
@@ -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)