diff mbox series

soc: qcom: spm: add SCM probe dependency

Message ID 20180723141735.32122-1-john@phrozen.org (mailing list archive)
State Accepted, archived
Delegated to: Andy Gross
Headers show
Series soc: qcom: spm: add SCM probe dependency | expand

Commit Message

John Crispin July 23, 2018, 2:17 p.m. UTC 
From: Felix Fietkau <nbd@nbd.name>

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>
---
 drivers/soc/qcom/spm.c | 3 +++
 1 file changed, 3 insertions(+)
diff mbox series

Patch

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)