diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
index 78ce38ff19f2..a079cbee4275 100644
--- a/arch/arm/include/asm/psci.h
+++ b/arch/arm/include/asm/psci.h
@@ -37,4 +37,12 @@ struct psci_operations {
 
 extern struct psci_operations psci_ops;
 
+#ifdef CONFIG_ARM_PSCI
+extern int __init psci_probe(void);
+#else
+static inline int psci_probe(void)
+{
+	return -ENODEV;
+}
+#endif
 #endif /* __ASM_ARM_PSCI_H */
diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
index 5211f18cd2b4..03c10f65adde 100644
--- a/arch/arm/kernel/psci.c
+++ b/arch/arm/kernel/psci.c
@@ -212,3 +212,16 @@ out_put_node:
 	return 0;
 }
 early_initcall(psci_init);
+
+int __init psci_probe(void)
+{
+	struct device_node *np;
+	int ret = -ENODEV;
+
+	np = of_find_matching_node(NULL, psci_of_match);
+	if (np)
+		ret = 0;
+
+	of_node_put(np);
+	return ret;
+}