target/linux/ipq40xx/patches-4.14/070-qcom-spm-fix-probe-order.patch

   1 From 341844c7e06afccd64261719fa388339a589b0a4 Mon Sep 17 00:00:00 2001
   2 From: Felix Fietkau <nbd@nbd.name>
   3 Date: Sun, 22 Jul 2018 12:53:04 +0200
   4 Subject: [PATCH] soc: qcom: spm: add SCM probe dependency
   5
   6 Check for SCM availability before attempting to use SPM. SPM probe will
   7 fail otherwise.
   8
   9 Signed-off-by: Felix Fietkau <nbd@nbd.name>
  10 Signed-off-by: John Crispin <john@phrozen.org>
  11 ---
  12  drivers/soc/qcom/spm.c | 3 +++
  13  1 file changed, 3 insertions(+)
  14
  15 diff --git a/drivers/soc/qcom/spm.c b/drivers/soc/qcom/spm.c
  16 index f9d7a85b2822..53807e839664 100644
  17 --- a/drivers/soc/qcom/spm.c
  18 +++ b/drivers/soc/qcom/spm.c
  19 @@ -219,6 +219,9 @@ static int __init qcom_cpuidle_init(struct device_node *cpu_node, int cpu)
  20         cpumask_t mask;
  21         bool use_scm_power_down = false;
  22
  23 +       if (!qcom_scm_is_available())
  24 +               return -EPROBE_DEFER;
  25 +
  26         for (i = 0; ; i++) {
  27                 state_node = of_parse_phandle(cpu_node, "cpu-idle-states", i);
  28                 if (!state_node)
  29 --
  30 2.11.0
  31