summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2016-11-08 17:55:47 +0000
committerArnd Bergmann <arnd@arndb.de>2016-11-25 23:26:05 +0100
commitd09a0011ec0d511b51d6378a071fd8d75eb27622 (patch)
tree77e64702ac81288c419e4bef0d8d4dec395a1d3d
parentea8b1c4a6019fb96ca8301f0b3ffcb13fb1cd0ae (diff)
downloadlinux-d09a0011ec0d511b51d6378a071fd8d75eb27622.tar.gz
linux-d09a0011ec0d511b51d6378a071fd8d75eb27622.tar.bz2
linux-d09a0011ec0d511b51d6378a071fd8d75eb27622.zip
drivers: psci: Allow PSCI node to be disabled
Allow disabling PSCI support (mostly for testing purposes) by setting the status property to "disabled". This makes the node behave in much the same way as proper device nodes. Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--drivers/firmware/psci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index 8263429e21b8..6c60a5087caf 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -630,7 +630,7 @@ int __init psci_dt_init(void)
np = of_find_matching_node_and_match(NULL, psci_of_match, &matched_np);
- if (!np)
+ if (!np || !of_device_is_available(np))
return -ENODEV;
init_fn = (psci_initcall_t)matched_np->data;